mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 72.0.3626.81
This commit is contained in:
@@ -7,5 +7,5 @@
|
||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/72.0.3626.28',
|
||||
'chromium_checkout': 'refs/tags/72.0.3626.81',
|
||||
}
|
||||
|
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||
index 08572d5b14f9..e4124d00fa83 100644
|
||||
index f79e53e96253..280cde01e3ca 100644
|
||||
--- chrome/browser/BUILD.gn
|
||||
+++ chrome/browser/BUILD.gn
|
||||
@@ -8,6 +8,7 @@ import("//build/config/features.gni")
|
||||
@@ -10,7 +10,7 @@ index 08572d5b14f9..e4124d00fa83 100644
|
||||
import("//chrome/common/features.gni")
|
||||
import("//components/feature_engagement/features.gni")
|
||||
import("//components/feed/features.gni")
|
||||
@@ -1725,6 +1726,7 @@ jumbo_split_static_library("browser") {
|
||||
@@ -1727,6 +1728,7 @@ jumbo_split_static_library("browser") {
|
||||
"//base:i18n",
|
||||
"//base/allocator:buildflags",
|
||||
"//cc",
|
||||
@@ -18,7 +18,7 @@ index 08572d5b14f9..e4124d00fa83 100644
|
||||
"//chrome:extra_resources",
|
||||
"//chrome:resources",
|
||||
"//chrome:strings",
|
||||
@@ -2004,6 +2006,10 @@ jumbo_split_static_library("browser") {
|
||||
@@ -2006,6 +2008,10 @@ jumbo_split_static_library("browser") {
|
||||
]
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ index 08572d5b14f9..e4124d00fa83 100644
|
||||
if (is_android) {
|
||||
sources += [
|
||||
"after_startup_task_utils_android.cc",
|
||||
@@ -3636,7 +3642,7 @@ jumbo_split_static_library("browser") {
|
||||
@@ -3638,7 +3644,7 @@ jumbo_split_static_library("browser") {
|
||||
]
|
||||
}
|
||||
|
||||
|
@@ -81,10 +81,10 @@ index b8e933d665cf..ef41dae49b39 100644
|
||||
"WillFailRequest state should come before WillProcessResponse");
|
||||
return render_frame_host_;
|
||||
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
|
||||
index 80f1a635ff52..3b8f65dddd74 100644
|
||||
index e738789b56a3..1e491a88b368 100644
|
||||
--- content/browser/frame_host/render_frame_host_impl.cc
|
||||
+++ content/browser/frame_host/render_frame_host_impl.cc
|
||||
@@ -1999,6 +1999,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
|
||||
@@ -2002,6 +2002,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
|
||||
if (GetNavigationHandle()) {
|
||||
GetNavigationHandle()->set_net_error_code(
|
||||
static_cast<net::Error>(params.error_code));
|
||||
@@ -92,7 +92,7 @@ index 80f1a635ff52..3b8f65dddd74 100644
|
||||
}
|
||||
|
||||
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
|
||||
@@ -4606,9 +4607,9 @@ void RenderFrameHostImpl::CommitNavigation(
|
||||
@@ -4609,9 +4610,9 @@ void RenderFrameHostImpl::CommitNavigation(
|
||||
DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService) ||
|
||||
base::FeatureList::IsEnabled(
|
||||
blink::features::kServiceWorkerServicification));
|
||||
@@ -340,7 +340,7 @@ index 8136604d267a..be7fde2f1a38 100644
|
||||
virtual void FocusedNodeChanged(const blink::WebNode& node) {}
|
||||
|
||||
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
|
||||
index 3448d04835df..ed625d890403 100644
|
||||
index a3919b6df597..60f564dfbe47 100644
|
||||
--- content/renderer/render_frame_impl.cc
|
||||
+++ content/renderer/render_frame_impl.cc
|
||||
@@ -3645,7 +3645,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
|
||||
|
@@ -68,10 +68,10 @@ index d44c7feaabec..5f1992335a38 100644
|
||||
|
||||
void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
|
||||
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
|
||||
index 388633d91746..38177eb10165 100644
|
||||
index 853e2dfc9163..8a0bd80230b0 100644
|
||||
--- chrome/test/BUILD.gn
|
||||
+++ chrome/test/BUILD.gn
|
||||
@@ -3908,7 +3908,7 @@ test("unit_tests") {
|
||||
@@ -3909,7 +3909,7 @@ test("unit_tests") {
|
||||
"../browser/ui/input_method/input_method_engine_unittest.cc",
|
||||
]
|
||||
}
|
||||
@@ -80,7 +80,7 @@ index 388633d91746..38177eb10165 100644
|
||||
sources +=
|
||||
[ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
|
||||
deps += [ "//build/config/linux/gtk" ]
|
||||
@@ -3929,7 +3929,7 @@ test("unit_tests") {
|
||||
@@ -3930,7 +3930,7 @@ test("unit_tests") {
|
||||
if (use_gio) {
|
||||
configs += [ "//build/linux:gio_config" ]
|
||||
}
|
||||
@@ -89,7 +89,7 @@ index 388633d91746..38177eb10165 100644
|
||||
deps += [ "//chrome/browser/ui/libgtkui" ]
|
||||
}
|
||||
|
||||
@@ -4914,7 +4914,7 @@ if (!is_android) {
|
||||
@@ -4915,7 +4915,7 @@ if (!is_android) {
|
||||
# suites, it seems like one or another starts timing out too.
|
||||
"../browser/ui/views/keyboard_access_browsertest.cc",
|
||||
]
|
||||
|
@@ -251,7 +251,7 @@ index c771efab4ae1..d07321aba204 100644
|
||||
CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true);
|
||||
}
|
||||
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
|
||||
index cb7dca2aceae..57419f9b0f16 100644
|
||||
index 3bc6b039b975..1b98f6d26461 100644
|
||||
--- content/browser/loader/navigation_url_loader_impl.cc
|
||||
+++ content/browser/loader/navigation_url_loader_impl.cc
|
||||
@@ -386,7 +386,7 @@ class AboutURLLoaderFactory : public network::mojom::URLLoaderFactory {
|
||||
@@ -263,7 +263,7 @@ index cb7dca2aceae..57419f9b0f16 100644
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
network::mojom::URLLoaderFactoryPtrInfo factory_info;
|
||||
network::mojom::URLLoaderFactoryParamsPtr params =
|
||||
@@ -1248,7 +1248,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
|
||||
@@ -1249,7 +1249,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
|
||||
// path does as well for navigations.
|
||||
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
|
||||
-1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
|
||||
@@ -272,7 +272,7 @@ index cb7dca2aceae..57419f9b0f16 100644
|
||||
false /* allow_wildcard */, &stale, &plugin, nullptr);
|
||||
|
||||
if (stale) {
|
||||
@@ -1616,7 +1616,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
|
||||
@@ -1617,7 +1617,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
|
||||
CreateResourceRequest(request_info.get(), frame_tree_node_id,
|
||||
IsNavigationDownloadAllowed(download_policy_));
|
||||
|
||||
|
@@ -135,7 +135,7 @@ index f772f64d656e..7d13f9f81b6c 100644
|
||||
return host ? host->GetAcceleratedWidget() : NULL;
|
||||
}
|
||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
||||
index 13328844822d..39120a96bed8 100644
|
||||
index c16d7368315b..e50508f4b0dc 100644
|
||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
||||
@@ -89,6 +89,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin(
|
||||
@@ -160,7 +160,7 @@ index 13328844822d..39120a96bed8 100644
|
||||
|
||||
remove_standard_frame_ = params.remove_standard_frame;
|
||||
has_non_client_view_ = Widget::RequiresNonClientView(params.type);
|
||||
@@ -889,11 +894,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
|
||||
@@ -877,11 +882,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
|
||||
}
|
||||
|
||||
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
|
||||
@@ -179,7 +179,7 @@ index 13328844822d..39120a96bed8 100644
|
||||
|
||||
bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
|
||||
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
||||
index 1def35f1eb39..360d10ce2927 100644
|
||||
index ecb84e76ae20..5e61312ad0fd 100644
|
||||
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
||||
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
|
||||
@@ -286,6 +286,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
|
||||
@@ -335,7 +335,7 @@ index c547609abf03..5092e2a38b67 100644
|
||||
base::WeakPtrFactory<DesktopWindowTreeHostX11> weak_factory_;
|
||||
|
||||
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
|
||||
index fff5a5d1556a..f936eaffbbbd 100644
|
||||
index 0353201e7933..557446296e18 100644
|
||||
--- ui/views/widget/widget.cc
|
||||
+++ ui/views/widget/widget.cc
|
||||
@@ -137,6 +137,7 @@ Widget::InitParams::InitParams(Type type)
|
||||
@@ -369,7 +369,7 @@ index fff5a5d1556a..f936eaffbbbd 100644
|
||||
}
|
||||
// This must come after SetContentsView() or it might not be able to find
|
||||
// the correct NativeTheme (on Linux). See http://crbug.com/384492
|
||||
@@ -1118,10 +1124,16 @@ void Widget::OnNativeWidgetDestroyed() {
|
||||
@@ -1114,10 +1120,16 @@ void Widget::OnNativeWidgetDestroyed() {
|
||||
}
|
||||
|
||||
gfx::Size Widget::GetMinimumSize() const {
|
||||
@@ -387,7 +387,7 @@ index fff5a5d1556a..f936eaffbbbd 100644
|
||||
}
|
||||
|
||||
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
|
||||
index 30a7c67d7566..92b71e568b63 100644
|
||||
index e7116c1b21d8..2d654367a1a6 100644
|
||||
--- ui/views/widget/widget.h
|
||||
+++ ui/views/widget/widget.h
|
||||
@@ -240,6 +240,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
||||
@@ -427,10 +427,10 @@ index c7296fed234d..244d0034a1c4 100644
|
||||
if (native_widget_delegate->IsDialogBox()) {
|
||||
*style |= DS_MODALFRAME;
|
||||
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
|
||||
index 97448327fa37..e69b494dbfeb 100644
|
||||
index 322315fb109b..50e22293abb5 100644
|
||||
--- ui/views/win/hwnd_message_handler.cc
|
||||
+++ ui/views/win/hwnd_message_handler.cc
|
||||
@@ -2895,10 +2895,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
|
||||
@@ -2903,10 +2903,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
|
||||
} else if (event.type() == ui::ET_MOUSEWHEEL) {
|
||||
ui::MouseWheelEvent mouse_wheel_event(msg);
|
||||
// Reroute the mouse wheel to the window under the pointer if applicable.
|
||||
|
@@ -258,8 +258,8 @@ void VerifyMinimize(CefRefPtr<CefWindow> window) {
|
||||
EXPECT_TRUE(window->IsMinimized());
|
||||
EXPECT_FALSE(window->IsMaximized());
|
||||
EXPECT_FALSE(window->IsFullscreen());
|
||||
EXPECT_FALSE(window->IsVisible());
|
||||
EXPECT_FALSE(window->IsDrawn());
|
||||
EXPECT_TRUE(window->IsVisible());
|
||||
EXPECT_TRUE(window->IsDrawn());
|
||||
|
||||
window->Restore();
|
||||
CefPostDelayedTask(TID_UI, base::Bind(VerifyRestore, window), kStateDelayMS);
|
||||
|
Reference in New Issue
Block a user