From 39f8ab63f37de0cff7fa586188e61d467e5d275d Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 4 Dec 2017 21:47:52 -0500 Subject: [PATCH] Update to Chromium version 63.0.3239.70 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_plugin_guest_1565.patch | 4 +-- patch/patches/chrome_profile.patch | 2 +- patch/patches/content_1129_2015.patch | 10 +++---- patch/patches/extensions_1947.patch | 2 +- .../patches/message_loop_443_1992243003.patch | 8 ++--- patch/patches/pdfium_print_549365.patch | 2 +- patch/patches/rwh_background_color_1984.patch | 8 ++--- patch/patches/storage_partition_1973.patch | 30 +++++++++---------- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 36ed112cc..869650ce8 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/63.0.3239.18', + 'chromium_checkout': 'refs/tags/63.0.3239.70', } diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index df6a92f5c..1d33851da 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc -index e6e79a68e263..c8007ccea445 100644 +index c73f9f0c640d..53b51a344ea0 100644 --- content/browser/browser_plugin/browser_plugin_guest.cc +++ content/browser/browser_plugin/browser_plugin_guest.cc @@ -337,8 +337,11 @@ void BrowserPluginGuest::InitInternal( @@ -15,7 +15,7 @@ index e6e79a68e263..c8007ccea445 100644 // Once a BrowserPluginGuest has an embedder WebContents, it's considered to // be attached. -@@ -832,10 +835,19 @@ void BrowserPluginGuest::OnWillAttachComplete( +@@ -834,10 +837,19 @@ void BrowserPluginGuest::OnWillAttachComplete( static_cast(GetWebContents()->GetView()); if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) { web_contents_view->CreateViewForWidget( diff --git a/patch/patches/chrome_profile.patch b/patch/patches/chrome_profile.patch index cf894f3aa..0f761f508 100644 --- a/patch/patches/chrome_profile.patch +++ b/patch/patches/chrome_profile.patch @@ -63,7 +63,7 @@ index 4b430133e16f..169ca4765907 100644 content::BrowserContext* GetBrowserContextRedirectedInIncognito( content::BrowserContext* context); diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index a711472a63a9..47212b151d41 100644 +index dcae848f76a2..5d81c0e85ab8 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -375,7 +375,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) diff --git a/patch/patches/content_1129_2015.patch b/patch/patches/content_1129_2015.patch index 7b016ab12..344ce20a2 100644 --- a/patch/patches/content_1129_2015.patch +++ b/patch/patches/content_1129_2015.patch @@ -108,7 +108,7 @@ index 28048bdb2046..b295b7a33601 100644 } diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc -index 2b2e16f95e48..17731d783a63 100644 +index a89eefd44037..7ff26d61e467 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc @@ -359,9 +359,9 @@ void ForwardRequest(const char* service_name, @@ -404,7 +404,7 @@ index 4f8478bfa87a..52471407518e 100644 virtual void FocusedNodeChanged(const blink::WebNode& node) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 9c48e63b7f25..6c4d4d91d368 100644 +index f1f589186855..61407e4c239b 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc @@ -2975,7 +2975,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -426,7 +426,7 @@ index 9c48e63b7f25..6c4d4d91d368 100644 } void RenderFrameImpl::WillCommitProvisionalLoad() { -@@ -5459,9 +5462,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( +@@ -5458,9 +5461,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( (!IsBrowserSideNavigationEnabled() || url != pending_navigation_params_->request_params.redirects[0])); @@ -438,7 +438,7 @@ index 9c48e63b7f25..6c4d4d91d368 100644 // The handlenavigation API is deprecated and will be removed once // crbug.com/325351 is resolved. if ((!IsBrowserSideNavigationEnabled() || !IsURLHandledByNetworkStack(url)) && -@@ -5471,7 +5473,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( +@@ -5470,7 +5472,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( is_redirect)) { return blink::kWebNavigationPolicyIgnore; } @@ -447,7 +447,7 @@ index 9c48e63b7f25..6c4d4d91d368 100644 // If the browser is interested, then give it a chance to look at the request. if (is_content_initiated && IsTopLevelNavigation(frame_) && diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index dc0111728c3e..b8ab8834fc97 100644 +index 13eeab3a9463..ef45b57113b3 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc @@ -779,6 +779,8 @@ void RenderThreadImpl::Init( diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 88b6e7227..0a76d275d 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -1,5 +1,5 @@ diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc -index 7e444585731f..2355ab4fec2b 100644 +index 5541f127d366..ad0f4bc58f59 100644 --- content/browser/frame_host/render_frame_host_manager.cc +++ content/browser/frame_host/render_frame_host_manager.cc @@ -1072,10 +1072,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( diff --git a/patch/patches/message_loop_443_1992243003.patch b/patch/patches/message_loop_443_1992243003.patch index 55b62ae59..f540e18ee 100644 --- a/patch/patches/message_loop_443_1992243003.patch +++ b/patch/patches/message_loop_443_1992243003.patch @@ -1,5 +1,5 @@ diff --git base/message_loop/message_loop.h base/message_loop/message_loop.h -index 0c82e51dfcd4..e5cb6fdb4c80 100644 +index 46171f803a0b..3dadd7732b23 100644 --- base/message_loop/message_loop.h +++ base/message_loop/message_loop.h @@ -277,6 +277,16 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate, @@ -19,9 +19,9 @@ index 0c82e51dfcd4..e5cb6fdb4c80 100644 // Returns true if the message loop is "idle". Provided for testing. bool IsIdleForTesting(); -@@ -376,6 +386,12 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate, - // need to be checked in conditionals). - bool nestable_tasks_allowed_; +@@ -380,6 +390,12 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate, + // is known to generate a system-driven nested loop. + bool task_execution_allowed_ = true; +#if defined(OS_WIN) + // Should be set to true before calling Windows APIs like TrackPopupMenu, etc. diff --git a/patch/patches/pdfium_print_549365.patch b/patch/patches/pdfium_print_549365.patch index e2fe55ee6..fbe4bb34a 100644 --- a/patch/patches/pdfium_print_549365.patch +++ b/patch/patches/pdfium_print_549365.patch @@ -14,7 +14,7 @@ index 3e3f22fdd..b5c2e5265 100644 static_library("test_support") { diff --git fpdfsdk/fpdfview.cpp fpdfsdk/fpdfview.cpp -index af1d0db1a..9b0397391 100644 +index 069a7239f..64354525d 100644 --- fpdfsdk/fpdfview.cpp +++ fpdfsdk/fpdfview.cpp @@ -37,6 +37,7 @@ diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index 71803975a..c896d1a9d 100644 --- a/patch/patches/rwh_background_color_1984.patch +++ b/patch/patches/rwh_background_color_1984.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index 7f727c290067..9d8a4683411f 100644 +index 9bcef0992e79..d09b2fb8ef4b 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -426,13 +426,6 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura( +@@ -431,13 +431,6 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura( selection_controller_client_.reset( new TouchSelectionControllerClientAura(this)); CreateSelectionController(); @@ -16,7 +16,7 @@ index 7f727c290067..9d8a4683411f 100644 } //////////////////////////////////////////////////////////////////////////////// -@@ -750,8 +743,10 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer( +@@ -755,8 +748,10 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer( background_color_ = color; bool opaque = SkColorGetA(color) == SK_AlphaOPAQUE; @@ -29,7 +29,7 @@ index 7f727c290067..9d8a4683411f 100644 } bool RenderWidgetHostViewAura::IsMouseLocked() { -@@ -1913,6 +1908,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { +@@ -1910,6 +1905,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { window_->Init(ui::LAYER_SOLID_COLOR); window_->layer()->SetColor(background_color_); diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index 52e161bb9..b3a16c096 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -201,7 +201,7 @@ index 337411c80e5a..7acc48a745a2 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index 44207cf02ab6..a59cd89a31f8 100644 +index a8dfd6c0c831..f9f0c698a71e 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -493,9 +493,8 @@ class SpareRenderProcessHostManager : public RenderProcessHostObserver { @@ -232,7 +232,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 // Is this the default storage partition? If it isn't, then just give it its // own non-shared process. -@@ -1206,7 +1204,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) { +@@ -1223,7 +1221,7 @@ void RenderProcessHost::SetMaxRendererProcessCount(size_t count) { // static RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( BrowserContext* browser_context, @@ -241,7 +241,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 SiteInstance* site_instance, bool is_for_guests_only) { if (g_render_process_host_factory_) { -@@ -1215,8 +1213,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( +@@ -1232,8 +1230,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( } if (!storage_partition_impl) { @@ -252,7 +252,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 } return new RenderProcessHostImpl(browser_context, storage_partition_impl, -@@ -1226,7 +1224,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( +@@ -1243,7 +1241,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( // static RenderProcessHost* RenderProcessHostImpl::CreateOrUseSpareRenderProcessHost( BrowserContext* browser_context, @@ -261,7 +261,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 SiteInstance* site_instance, bool is_for_guests_only) { RenderProcessHost* render_process_host = -@@ -1246,7 +1244,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateOrUseSpareRenderProcessHost( +@@ -1263,7 +1261,7 @@ RenderProcessHost* RenderProcessHostImpl::CreateOrUseSpareRenderProcessHost( RenderProcessHostImpl::RenderProcessHostImpl( BrowserContext* browser_context, @@ -270,7 +270,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 bool is_for_guests_only) : fast_shutdown_started_(false), deleting_soon_(false), -@@ -1282,7 +1280,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1299,7 +1297,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( indexed_db_factory_(new IndexedDBDispatcherHost( id_, storage_partition_impl_->GetURLRequestContext(), @@ -280,7 +280,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 ChromeBlobStorageContext::GetFor(browser_context_))), channel_connected_(false), sent_render_process_ready_(false), -@@ -1316,7 +1315,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1333,7 +1332,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( } push_messaging_manager_.reset(new PushMessagingManager( @@ -290,7 +290,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 AddObserver(indexed_db_factory_.get()); -@@ -1620,6 +1620,20 @@ void RenderProcessHostImpl::ResetChannelProxy() { +@@ -1637,6 +1637,20 @@ void RenderProcessHostImpl::ResetChannelProxy() { void RenderProcessHostImpl::CreateMessageFilters() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -311,7 +311,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 AddFilter(new ResourceSchedulerFilter(GetID())); MediaInternals* media_internals = MediaInternals::GetInstance(); // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages -@@ -1634,8 +1648,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1651,8 +1665,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { new RenderMessageFilter( GetID(), GetBrowserContext(), request_context.get(), widget_helper_.get(), media_internals, @@ -322,7 +322,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 AddFilter(render_message_filter.get()); render_frame_message_filter_ = new RenderFrameMessageFilter( -@@ -1664,10 +1678,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1681,10 +1695,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { ChromeBlobStorageContext::GetFor(browser_context); resource_message_filter_ = new ResourceMessageFilter( @@ -335,7 +335,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); AddFilter(resource_message_filter_.get()); -@@ -1694,10 +1708,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1711,10 +1725,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter( new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service())); AddFilter(new AppCacheDispatcherHost( @@ -348,7 +348,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 #if BUILDFLAG(ENABLE_WEBRTC) peer_connection_tracker_host_ = new PeerConnectionTrackerHost( -@@ -1731,13 +1745,12 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1748,13 +1762,12 @@ void RenderProcessHostImpl::CreateMessageFilters() { scoped_refptr cache_storage_filter = new CacheStorageDispatcherHost(); @@ -364,7 +364,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 AddFilter(service_worker_filter.get()); #if BUILDFLAG(ENABLE_WEBRTC) -@@ -1752,11 +1765,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1769,11 +1782,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { GetID(), storage_partition_impl_->GetQuotaManager(), GetContentClient()->browser()->CreateQuotaPermissionContext())); @@ -377,7 +377,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 resource_context, service_worker_context, browser_context); AddFilter(notification_message_filter_.get()); -@@ -1771,6 +1781,11 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1788,6 +1798,11 @@ void RenderProcessHostImpl::CreateMessageFilters() { void RenderProcessHostImpl::RegisterMojoInterfaces() { auto registry = base::MakeUnique(); @@ -389,7 +389,7 @@ index 44207cf02ab6..a59cd89a31f8 100644 channel_->AddAssociatedInterfaceForIOThread( base::Bind(&IndexedDBDispatcherHost::AddBinding, base::Unretained(indexed_db_factory_.get()))); -@@ -1825,8 +1840,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -1842,8 +1857,7 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { AddUIThreadInterface( registry.get(), base::Bind(&PlatformNotificationContextImpl::CreateService,