mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 70.0.3538.102
This commit is contained in:
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/70.0.3538.77',
|
'chromium_checkout': 'refs/tags/70.0.3538.102',
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||||
index ccc2e812de7b..6d7e1e05434e 100644
|
index f37afc63467b..eb99c80f0516 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -8,6 +8,7 @@ import("//build/config/features.gni")
|
@@ -8,6 +8,7 @@ import("//build/config/features.gni")
|
||||||
@@ -10,7 +10,7 @@ index ccc2e812de7b..6d7e1e05434e 100644
|
|||||||
import("//chrome/common/features.gni")
|
import("//chrome/common/features.gni")
|
||||||
import("//components/feature_engagement/features.gni")
|
import("//components/feature_engagement/features.gni")
|
||||||
import("//components/feed/features.gni")
|
import("//components/feed/features.gni")
|
||||||
@@ -1689,6 +1690,7 @@ jumbo_split_static_library("browser") {
|
@@ -1691,6 +1692,7 @@ jumbo_split_static_library("browser") {
|
||||||
"//base:i18n",
|
"//base:i18n",
|
||||||
"//base/allocator:buildflags",
|
"//base/allocator:buildflags",
|
||||||
"//cc",
|
"//cc",
|
||||||
@@ -18,7 +18,7 @@ index ccc2e812de7b..6d7e1e05434e 100644
|
|||||||
"//chrome:extra_resources",
|
"//chrome:extra_resources",
|
||||||
"//chrome:resources",
|
"//chrome:resources",
|
||||||
"//chrome:strings",
|
"//chrome:strings",
|
||||||
@@ -1963,6 +1965,10 @@ jumbo_split_static_library("browser") {
|
@@ -1965,6 +1967,10 @@ jumbo_split_static_library("browser") {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ index ccc2e812de7b..6d7e1e05434e 100644
|
|||||||
if (is_android) {
|
if (is_android) {
|
||||||
sources += [
|
sources += [
|
||||||
"after_startup_task_utils_android.cc",
|
"after_startup_task_utils_android.cc",
|
||||||
@@ -3506,7 +3512,7 @@ jumbo_split_static_library("browser") {
|
@@ -3508,7 +3514,7 @@ jumbo_split_static_library("browser") {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -251,10 +251,10 @@ index 37cabf2c9ffa..a5165fdbfdf6 100644
|
|||||||
CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true);
|
CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true);
|
||||||
}
|
}
|
||||||
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
|
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
|
||||||
index f14b46b86a87..4e5467dbc2a5 100644
|
index 2c8e4c488be4..be77d11bf2ba 100644
|
||||||
--- content/browser/loader/navigation_url_loader_impl.cc
|
--- content/browser/loader/navigation_url_loader_impl.cc
|
||||||
+++ content/browser/loader/navigation_url_loader_impl.cc
|
+++ content/browser/loader/navigation_url_loader_impl.cc
|
||||||
@@ -1160,7 +1160,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
|
@@ -1173,7 +1173,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
|
||||||
// path does as well for navigations.
|
// path does as well for navigations.
|
||||||
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
|
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
|
||||||
-1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
|
-1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
|
||||||
@@ -263,7 +263,7 @@ index f14b46b86a87..4e5467dbc2a5 100644
|
|||||||
false /* allow_wildcard */, &stale, &plugin, nullptr);
|
false /* allow_wildcard */, &stale, &plugin, nullptr);
|
||||||
|
|
||||||
if (stale) {
|
if (stale) {
|
||||||
@@ -1524,7 +1524,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
|
@@ -1536,7 +1536,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
|
||||||
network::mojom::URLLoaderFactoryPtrInfo proxied_factory_info;
|
network::mojom::URLLoaderFactoryPtrInfo proxied_factory_info;
|
||||||
network::mojom::URLLoaderFactoryRequest proxied_factory_request;
|
network::mojom::URLLoaderFactoryRequest proxied_factory_request;
|
||||||
bool bypass_redirect_checks = false;
|
bool bypass_redirect_checks = false;
|
||||||
|
Reference in New Issue
Block a user