From 2a6491bf8d5fc58e6eb70a8324ab5bdd29afa598 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 9 Mar 2016 18:33:44 -0500 Subject: [PATCH] Update to Chromium version 49.0.2623.87 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_web_contents_1257.patch | 8 +++---- patch/patches/build.patch | 2 +- patch/patches/content_nav_1129.patch | 2 +- patch/patches/events_x_utils.patch | 8 +++---- patch/patches/prefs_content_1161.patch | 14 ++++++------ patch/patches/views_widget_180_1677.patch | 2 +- ...ebkit_overlay_scrollbar_color_588709.patch | 22 +++++++++---------- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index cbdb721b8..010253c21 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/49.0.2623.54', + 'chromium_checkout': 'refs/tags/49.0.2623.87', } diff --git a/patch/patches/browser_web_contents_1257.patch b/patch/patches/browser_web_contents_1257.patch index c0222a27e..0202f75fa 100644 --- a/patch/patches/browser_web_contents_1257.patch +++ b/patch/patches/browser_web_contents_1257.patch @@ -1,8 +1,8 @@ diff --git web_contents_impl.cc web_contents_impl.cc -index 233c1e0..e95858d 100644 +index b5b0b78..2ee9174 100644 --- web_contents_impl.cc +++ web_contents_impl.cc -@@ -1387,32 +1387,40 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1373,32 +1373,40 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { main_frame_widget_routing_id); frame_tree_.root()->SetFrameName(params.main_frame_name); @@ -62,7 +62,7 @@ index 233c1e0..e95858d 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -1834,11 +1842,14 @@ void WebContentsImpl::CreateNewWindow( +@@ -1820,11 +1828,14 @@ void WebContentsImpl::CreateNewWindow( static_cast(session_storage_namespace); CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context)); @@ -78,7 +78,7 @@ index 233c1e0..e95858d 100644 if (route_id != MSG_ROUTING_NONE && !RenderViewHost::FromID(render_process_id, route_id)) { // If the embedder didn't create a WebContents for this route, we need to -@@ -1859,6 +1870,8 @@ void WebContentsImpl::CreateNewWindow( +@@ -1845,6 +1856,8 @@ void WebContentsImpl::CreateNewWindow( create_params.opener_render_process_id = render_process_id; create_params.opener_render_frame_id = params.opener_render_frame_id; create_params.opener_suppressed = params.opener_suppressed; diff --git a/patch/patches/build.patch b/patch/patches/build.patch index 29b838fd6..bdd8fb216 100644 --- a/patch/patches/build.patch +++ b/patch/patches/build.patch @@ -1,5 +1,5 @@ diff --git common.gypi common.gypi -index 514b129..036fe51 100644 +index 2063a6c..282cd0d 100644 --- common.gypi +++ common.gypi @@ -9,6 +9,9 @@ diff --git a/patch/patches/content_nav_1129.patch b/patch/patches/content_nav_1129.patch index 18992fc15..2cde1ae25 100644 --- a/patch/patches/content_nav_1129.patch +++ b/patch/patches/content_nav_1129.patch @@ -39,7 +39,7 @@ index 45686b5..18548a0 100644 // Returns true if we should fork a new process for the given navigation. // If |send_referrer| is set to false (which is the default), no referrer diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc -index 16d742f..f9e4238 100644 +index 592cd08..7515ef2 100644 --- renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc @@ -4687,7 +4687,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( diff --git a/patch/patches/events_x_utils.patch b/patch/patches/events_x_utils.patch index b983175b1..ae299e51d 100644 --- a/patch/patches/events_x_utils.patch +++ b/patch/patches/events_x_utils.patch @@ -1,10 +1,10 @@ diff --git events_x_utils.h events_x_utils.h -index dfa821f..f918051 100644 +index 15c4e38..592417ce 100644 --- events_x_utils.h +++ events_x_utils.h -@@ -82,7 +82,7 @@ bool GetFlingDataFromXEvent(const XEvent& xev, - float* vy_ordinal, - bool* is_cancel); +@@ -80,7 +80,7 @@ EVENTS_X_EXPORT bool GetFlingDataFromXEvent(const XEvent& xev, + float* vy_ordinal, + bool* is_cancel); -EVENTS_X_EXPORT void ResetTimestampRolloverCountersForTesting(); +void ResetTimestampRolloverCountersForTesting(); diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index 06e96e2bc..9dc40d558 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -1,8 +1,8 @@ diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h -index e3efceb..f5b3e2f 100644 +index a1917f5..765fe1c 100644 --- public/common/common_param_traits_macros.h +++ public/common/common_param_traits_macros.h -@@ -194,6 +194,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) +@@ -195,6 +195,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes) IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale) IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled) @@ -11,7 +11,7 @@ index e3efceb..f5b3e2f 100644 IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop) IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled) diff --git public/common/web_preferences.cc public/common/web_preferences.cc -index 8ec979c..9fc043d 100644 +index 68ccbb4..8460874 100644 --- public/common/web_preferences.cc +++ public/common/web_preferences.cc @@ -172,6 +172,7 @@ WebPreferences::WebPreferences() @@ -20,10 +20,10 @@ index 8ec979c..9fc043d 100644 navigate_on_drag_drop(true), + base_background_color(0xFFFFFFFF), // Color::white v8_cache_options(V8_CACHE_OPTIONS_DEFAULT), + inert_visual_viewport(false), cookie_enabled(true), - pepper_accelerated_video_decode_enabled(false), diff --git public/common/web_preferences.h public/common/web_preferences.h -index 9926fc6..8cb6fee 100644 +index b784443..b04d69f 100644 --- public/common/web_preferences.h +++ public/common/web_preferences.h @@ -173,6 +173,7 @@ struct CONTENT_EXPORT WebPreferences { @@ -32,10 +32,10 @@ index 9926fc6..8cb6fee 100644 bool navigate_on_drag_drop; + uint32_t base_background_color; V8CacheOptions v8_cache_options; + bool inert_visual_viewport; - // This flags corresponds to a Page's Settings' setCookieEnabled state. It diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc -index 2f80795..9eddd24 100644 +index c2c266c..0a88250 100644 --- renderer/render_view_impl.cc +++ renderer/render_view_impl.cc @@ -938,6 +938,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, diff --git a/patch/patches/views_widget_180_1677.patch b/patch/patches/views_widget_180_1677.patch index 8d5e0e9ac..fb774ce60 100644 --- a/patch/patches/views_widget_180_1677.patch +++ b/patch/patches/views_widget_180_1677.patch @@ -346,7 +346,7 @@ index 5ab84f9..c4095fa 100644 x_active_window_ = None; } diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index 18aa4c6..147c5a7 100644 +index 02a570db6..2225c88 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc @@ -126,6 +126,7 @@ Widget::InitParams::InitParams() diff --git a/patch/patches/webkit_overlay_scrollbar_color_588709.patch b/patch/patches/webkit_overlay_scrollbar_color_588709.patch index e6ccc58ad..050899a9e 100644 --- a/patch/patches/webkit_overlay_scrollbar_color_588709.patch +++ b/patch/patches/webkit_overlay_scrollbar_color_588709.patch @@ -1,8 +1,8 @@ diff --git Source/core/frame/FrameView.cpp Source/core/frame/FrameView.cpp -index f9edd39..90947ba 100644 +index 6e36bd9..e3bc581 100644 --- Source/core/frame/FrameView.cpp +++ Source/core/frame/FrameView.cpp -@@ -356,24 +356,6 @@ void FrameView::invalidateAllCustomScrollbarsOnActiveChanged() +@@ -357,24 +357,6 @@ void FrameView::invalidateAllCustomScrollbarsOnActiveChanged() recalculateCustomScrollbarStyle(); } @@ -27,7 +27,7 @@ index f9edd39..90947ba 100644 void FrameView::clear() { reset(); -@@ -1833,7 +1815,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor) +@@ -1834,7 +1816,7 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor) if (compositedLayerMapping->mainGraphicsLayer()) compositedLayerMapping->mainGraphicsLayer()->setNeedsDisplay(); } @@ -49,10 +49,11 @@ index 09d6cb6..113a7b9 100644 void clear(); diff --git Source/core/layout/LayoutBox.cpp Source/core/layout/LayoutBox.cpp -index 596df85..0dcaa00 100644 +index 596df85..1519d5c 100644 --- Source/core/layout/LayoutBox.cpp +++ Source/core/layout/LayoutBox.cpp -@@ -249,7 +249,7 @@ void LayoutBox::styleDidChange(StyleDifference diff, const ComputedStyle* oldSty +@@ -248,7 +248,7 @@ void LayoutBox::styleDidChange(StyleDifference diff, const ComputedStyle* oldSty + } if (isDocumentElement() || isBody()) { - document().view()->recalculateScrollbarOverlayStyle(); @@ -60,12 +61,11 @@ index 596df85..0dcaa00 100644 document().view()->recalculateCustomScrollbarStyle(); if (LayoutView* layoutView = view()) { if (PaintLayerScrollableArea* scrollableArea = layoutView->scrollableArea()) { - if (scrollableArea->horizontalScrollbar() && scrollableArea->horizontalScrollbar()->isCustomScrollbar()) diff --git Source/core/paint/PaintLayerScrollableArea.cpp Source/core/paint/PaintLayerScrollableArea.cpp -index 0067b70..03c766c 100644 +index fbca377..74eddd1 100644 --- Source/core/paint/PaintLayerScrollableArea.cpp +++ Source/core/paint/PaintLayerScrollableArea.cpp -@@ -847,6 +847,19 @@ void PaintLayerScrollableArea::updateAfterStyleChange(const ComputedStyle* oldSt +@@ -827,6 +827,19 @@ void PaintLayerScrollableArea::updateAfterStyleChange(const ComputedStyle* oldSt updateScrollCornerStyle(); updateResizerAreaSet(); updateResizerStyle(); @@ -85,7 +85,7 @@ index 0067b70..03c766c 100644 } bool PaintLayerScrollableArea::updateAfterCompositingChange() -@@ -1483,9 +1496,14 @@ void PaintLayerScrollableArea::ScrollbarManager::setHasHorizontalScrollbar(bool +@@ -1463,9 +1476,14 @@ void PaintLayerScrollableArea::ScrollbarManager::setHasHorizontalScrollbar(bool // This doesn't hit in any tests, but since the equivalent code in setHasVerticalScrollbar // does, presumably this code does as well. DisableCompositingQueryAsserts disabler; @@ -102,7 +102,7 @@ index 0067b70..03c766c 100644 } else { m_hBarIsAttached = 0; if (!m_canDetachScrollbars) -@@ -1497,9 +1515,14 @@ void PaintLayerScrollableArea::ScrollbarManager::setHasVerticalScrollbar(bool ha +@@ -1477,9 +1495,14 @@ void PaintLayerScrollableArea::ScrollbarManager::setHasVerticalScrollbar(bool ha { if (hasScrollbar) { DisableCompositingQueryAsserts disabler; @@ -119,7 +119,7 @@ index 0067b70..03c766c 100644 } else { m_vBarIsAttached = 0; if (!m_canDetachScrollbars) -@@ -1520,10 +1543,6 @@ PassRefPtrWillBeRawPtr PaintLayerScrollableArea::ScrollbarManager::cr +@@ -1500,10 +1523,6 @@ PassRefPtrWillBeRawPtr PaintLayerScrollableArea::ScrollbarManager::cr if (actualLayoutObject.styleRef().hasAppearance()) scrollbarSize = LayoutTheme::theme().scrollbarControlSizeForPart(actualLayoutObject.styleRef().appearance()); scrollbar = Scrollbar::create(m_scrollableArea.get(), orientation, scrollbarSize, &m_scrollableArea->box().frame()->page()->chromeClient());