From d300dc43d9ba4571c54c63f82c9bfeabfae871ed Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 3 Feb 2016 15:35:01 -0500 Subject: [PATCH] Update to Chromium version 49.0.2623.28 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_web_contents_1257.patch | 8 ++--- patch/patches/chrome_browser_1257.patch | 4 +-- patch/patches/content_nav_1129.patch | 6 ++-- patch/patches/views_widget_180_1677.patch | 36 +++++++++---------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 229b03beb..41ad2786e 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': '92d77538a86529ca35f9220bd3cd512cbea1f086', + 'chromium_checkout': 'refs/tags/49.0.2623.28', } diff --git a/patch/patches/browser_web_contents_1257.patch b/patch/patches/browser_web_contents_1257.patch index 7fdf3aa6a..c0222a27e 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 ccadfb2..b70b8e4 100644 +index 233c1e0..e95858d 100644 --- web_contents_impl.cc +++ web_contents_impl.cc -@@ -1388,32 +1388,40 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1387,32 +1387,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 ccadfb2..b70b8e4 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -1835,11 +1843,14 @@ void WebContentsImpl::CreateNewWindow( +@@ -1834,11 +1842,14 @@ void WebContentsImpl::CreateNewWindow( static_cast(session_storage_namespace); CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context)); @@ -78,7 +78,7 @@ index ccadfb2..b70b8e4 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 -@@ -1860,6 +1871,8 @@ void WebContentsImpl::CreateNewWindow( +@@ -1859,6 +1870,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/chrome_browser_1257.patch b/patch/patches/chrome_browser_1257.patch index 67abd5132..55aa97d0d 100644 --- a/patch/patches/chrome_browser_1257.patch +++ b/patch/patches/chrome_browser_1257.patch @@ -1,8 +1,8 @@ diff --git ui/browser.cc ui/browser.cc -index 717381d..35f791b 100644 +index 45656f3..d5fb838 100644 --- ui/browser.cc +++ ui/browser.cc -@@ -1707,7 +1707,9 @@ bool Browser::ShouldCreateWebContents( +@@ -1708,7 +1708,9 @@ bool Browser::ShouldCreateWebContents( const std::string& frame_name, const GURL& target_url, const std::string& partition_id, diff --git a/patch/patches/content_nav_1129.patch b/patch/patches/content_nav_1129.patch index 6dd51fe86..18992fc15 100644 --- a/patch/patches/content_nav_1129.patch +++ b/patch/patches/content_nav_1129.patch @@ -39,10 +39,10 @@ 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 9b199d3..1a8b6fa 100644 +index 16d742f..f9e4238 100644 --- renderer/render_frame_impl.cc +++ renderer/render_frame_impl.cc -@@ -4684,7 +4684,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( +@@ -4687,7 +4687,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( (pending_navigation_params_ && !pending_navigation_params_->request_params.redirects.empty()); @@ -50,7 +50,7 @@ index 9b199d3..1a8b6fa 100644 // The handlenavigation API is deprecated and will be removed once // crbug.com/325351 is resolved. if (info.urlRequest.url() != GURL(kSwappedOutURL) && -@@ -4694,7 +4693,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( +@@ -4697,7 +4696,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( is_redirect)) { return blink::WebNavigationPolicyIgnore; } diff --git a/patch/patches/views_widget_180_1677.patch b/patch/patches/views_widget_180_1677.patch index e2e702754..8d5e0e9ac 100644 --- a/patch/patches/views_widget_180_1677.patch +++ b/patch/patches/views_widget_180_1677.patch @@ -150,10 +150,10 @@ index ad82485..13e74b9 100644 // a reference. corewm::TooltipWin* tooltip_; diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -index f7495f0..3d9b9a2 100644 +index e2fb724..c4bf33d 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -@@ -168,6 +168,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( +@@ -167,6 +167,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( use_native_frame_(false), should_maximize_after_map_(false), use_argb_visual_(false), @@ -161,17 +161,17 @@ index f7495f0..3d9b9a2 100644 drag_drop_client_(NULL), native_widget_delegate_(native_widget_delegate), desktop_native_widget_aura_(desktop_native_widget_aura), -@@ -177,7 +178,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( +@@ -175,7 +176,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( + custom_window_shape_(false), urgency_hint_set_(false), activatable_(true), - modal_dialog_xid_(0), - close_widget_factory_(this) { + close_widget_factory_(this), + xwindow_destroyed_(false) { } DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() { -@@ -388,7 +390,8 @@ void DesktopWindowTreeHostX11::CloseNow() { +@@ -386,7 +388,8 @@ void DesktopWindowTreeHostX11::CloseNow() { // Actually free our native resources. if (ui::PlatformEventSource::GetInstance()) ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this); @@ -181,7 +181,7 @@ index f7495f0..3d9b9a2 100644 xwindow_ = None; desktop_native_widget_aura_->OnHostClosed(); -@@ -537,6 +540,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement( +@@ -535,6 +538,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement( } gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const { @@ -190,7 +190,7 @@ index f7495f0..3d9b9a2 100644 return ToDIPRect(bounds_in_pixels_); } -@@ -974,6 +979,8 @@ void DesktopWindowTreeHostX11::HideImpl() { +@@ -972,6 +977,8 @@ void DesktopWindowTreeHostX11::HideImpl() { } gfx::Rect DesktopWindowTreeHostX11::GetBounds() const { @@ -199,7 +199,7 @@ index f7495f0..3d9b9a2 100644 return bounds_in_pixels_; } -@@ -1031,6 +1038,8 @@ void DesktopWindowTreeHostX11::SetBounds( +@@ -1029,6 +1036,8 @@ void DesktopWindowTreeHostX11::SetBounds( } gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const { @@ -208,7 +208,7 @@ index f7495f0..3d9b9a2 100644 return bounds_in_pixels_.origin(); } -@@ -1139,9 +1148,15 @@ void DesktopWindowTreeHostX11::InitX11Window( +@@ -1137,9 +1146,15 @@ void DesktopWindowTreeHostX11::InitX11Window( use_argb_visual_ = true; } @@ -225,7 +225,7 @@ index f7495f0..3d9b9a2 100644 bounds_in_pixels_.y(), bounds_in_pixels_.width(), bounds_in_pixels_.height(), 0, // border width -@@ -1770,6 +1785,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent( +@@ -1767,6 +1782,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent( } break; } @@ -237,12 +237,12 @@ index f7495f0..3d9b9a2 100644 if (xev->xfocus.mode != NotifyGrab) { ReleaseCapture(); diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h -index 1036152..7b2b426 100644 +index 759194f..13af979 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h -@@ -98,6 +98,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 - // there is no dialog on the host window. - XID GetModalDialog(); +@@ -87,6 +87,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 + // internal list of open windows. + static void CleanUpWindowList(void (*func)(aura::Window* window)); + void set_screen_bounds(const gfx::Rect& bounds) { screen_bounds_ = bounds; } + @@ -253,7 +253,7 @@ index 1036152..7b2b426 100644 protected: // Overridden from DesktopWindowTreeHost: void Init(aura::Window* content_window, -@@ -274,6 +280,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 +@@ -263,6 +269,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 // The bounds of |xwindow_|. gfx::Rect bounds_in_pixels_; @@ -263,7 +263,7 @@ index 1036152..7b2b426 100644 // Whenever the bounds are set, we keep the previous set of bounds around so // we can have a better chance of getting the real // |restored_bounds_in_pixels_|. Window managers tend to send a Configure -@@ -310,6 +319,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 +@@ -299,6 +308,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 // Whether we used an ARGB visual for our window. bool use_argb_visual_; @@ -274,7 +274,7 @@ index 1036152..7b2b426 100644 DesktopDragDropClientAuraX11* drag_drop_client_; scoped_ptr x11_non_client_event_filter_; -@@ -366,6 +379,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 +@@ -351,6 +364,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 base::WeakPtrFactory close_widget_factory_; @@ -285,7 +285,7 @@ index 1036152..7b2b426 100644 }; diff --git ui/views/widget/desktop_aura/x11_desktop_handler.cc ui/views/widget/desktop_aura/x11_desktop_handler.cc -index 9b20295..20b1aec 100644 +index 5ab84f9..c4095fa 100644 --- ui/views/widget/desktop_aura/x11_desktop_handler.cc +++ ui/views/widget/desktop_aura/x11_desktop_handler.cc @@ -31,6 +31,30 @@ views::X11DesktopHandler* g_handler = NULL;