From 90c8571f731a019158b31e6e33af1907a7184557 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 27 May 2016 13:53:25 -0400 Subject: [PATCH] Update to Chromium version 51.0.2704.63 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- libcef/browser/osr/render_widget_host_view_osr.cc | 14 ++++++++++++++ libcef/browser/osr/render_widget_host_view_osr.h | 3 ++- patch/patches/render_widget_host_1070383005.patch | 4 ++-- .../patches/views_widget_180_1481_1677_1749.patch | 6 +++--- patch/patches/webkit_popups.patch | 4 ++-- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index dc0770f62..321254f39 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/51.0.2704.47', + 'chromium_checkout': 'refs/tags/51.0.2704.63', } diff --git a/libcef/browser/osr/render_widget_host_view_osr.cc b/libcef/browser/osr/render_widget_host_view_osr.cc index 943079672..7ed6b8647 100644 --- a/libcef/browser/osr/render_widget_host_view_osr.cc +++ b/libcef/browser/osr/render_widget_host_view_osr.cc @@ -24,6 +24,7 @@ #include "content/browser/compositor/gl_helper.h" #include "content/browser/compositor/image_transport_factory.h" #include "content/browser/renderer_host/dip_util.h" +#include "content/browser/renderer_host/render_widget_host_delegate.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/resize_lock.h" #include "content/common/view_messages.h" @@ -1017,6 +1018,19 @@ bool CefRenderWidgetHostViewOSR::DelegatedFrameHostIsVisible() const { return !render_widget_host_->is_hidden(); } +SkColor CefRenderWidgetHostViewOSR::DelegatedFrameHostGetGutterColor( + SkColor color) const { + // When making an element on the page fullscreen the element's background + // may not match the page's, so use black as the gutter color to avoid + // flashes of brighter colors during the transition. + if (render_widget_host_->delegate() && + render_widget_host_->delegate()->IsFullscreenForCurrentTab( + render_widget_host_)) { + return SK_ColorBLACK; + } + return color; +} + gfx::Size CefRenderWidgetHostViewOSR::DelegatedFrameHostDesiredSizeInDIP() const { return root_layer_->bounds().size(); diff --git a/libcef/browser/osr/render_widget_host_view_osr.h b/libcef/browser/osr/render_widget_host_view_osr.h index e8bb66f20..af6aa7a64 100644 --- a/libcef/browser/osr/render_widget_host_view_osr.h +++ b/libcef/browser/osr/render_widget_host_view_osr.h @@ -204,8 +204,9 @@ class CefRenderWidgetHostViewOSR // DelegatedFrameHostClient implementation. ui::Layer* DelegatedFrameHostGetLayer() const override; bool DelegatedFrameHostIsVisible() const override; + SkColor DelegatedFrameHostGetGutterColor(SkColor color) const override; gfx::Size DelegatedFrameHostDesiredSizeInDIP() const override; - bool DelegatedFrameCanCreateResizeLock() const override; + bool DelegatedFrameCanCreateResizeLock() const override; std::unique_ptr DelegatedFrameHostCreateResizeLock( bool defer_compositor_lock) override; void DelegatedFrameHostResizeLockWasReleased() override; diff --git a/patch/patches/render_widget_host_1070383005.patch b/patch/patches/render_widget_host_1070383005.patch index 21a557683..5964db2f5 100644 --- a/patch/patches/render_widget_host_1070383005.patch +++ b/patch/patches/render_widget_host_1070383005.patch @@ -1,8 +1,8 @@ diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm -index 0581389..7df96d1 100644 +index 9b3f3f6..ddd2464 100644 --- render_widget_host_view_mac.mm +++ render_widget_host_view_mac.mm -@@ -537,9 +537,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget, +@@ -550,9 +550,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget, // Paint this view host with |background_color_| when there is no content // ready to draw. background_layer_.reset([[CALayer alloc] init]); diff --git a/patch/patches/views_widget_180_1481_1677_1749.patch b/patch/patches/views_widget_180_1481_1677_1749.patch index 17b4895e0..ae694a625 100644 --- a/patch/patches/views_widget_180_1481_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1677_1749.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index 30b0778..bf86bd1 100644 +index 8b16632..fb22089 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -678,6 +678,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() { @@ -473,7 +473,7 @@ index ca561b6..7940b5a 100644 } case Widget::InitParams::TYPE_CONTROL: diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc -index 74d5cd6..19d208e 100644 +index 7555abd..78ebc93 100644 --- ui/views/win/hwnd_message_handler.cc +++ ui/views/win/hwnd_message_handler.cc @@ -838,6 +838,8 @@ void HWNDMessageHandler::SizeConstraintsChanged() { @@ -485,7 +485,7 @@ index 74d5cd6..19d208e 100644 SetWindowLong(hwnd(), GWL_STYLE, style); } -@@ -2433,8 +2435,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, +@@ -2435,8 +2437,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, active_mouse_tracking_flags_ = 0; } else if (event.type() == ui::ET_MOUSEWHEEL) { // Reroute the mouse wheel to the window under the pointer if applicable. diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 321e9f0d5..0c5eace4c 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -12,7 +12,7 @@ index 8884238..7b139ba 100644 DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp -index e906bb7..40965ed 100644 +index 22c0a1e..4996084 100644 --- Source/web/WebViewImpl.cpp +++ Source/web/WebViewImpl.cpp @@ -416,6 +416,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client) @@ -23,7 +23,7 @@ index e906bb7..40965ed 100644 , m_doingDragAndDrop(false) , m_ignoreInputEvents(false) , m_compositorDeviceScaleFactorOverride(0) -@@ -4120,9 +4121,14 @@ void WebViewImpl::pageScaleFactorChanged() +@@ -4119,9 +4120,14 @@ void WebViewImpl::pageScaleFactorChanged() m_client->pageScaleFactorChanged(); }