diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 2c718740b..06d0747cc 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'bc084a8b5afa3744a74927344e304c02ae54189f', + 'chromium_checkout': 'refs/tags/65.0.3325.73', } diff --git a/patch/patches/browser_compositor_mac.patch b/patch/patches/browser_compositor_mac.patch index c0613e9a3..549f53cb8 100644 --- a/patch/patches/browser_compositor_mac.patch +++ b/patch/patches/browser_compositor_mac.patch @@ -20,7 +20,7 @@ diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/ index 8e98fb37c1d4..8dc887eac61b 100644 --- content/browser/renderer_host/browser_compositor_view_mac.mm +++ content/browser/renderer_host/browser_compositor_view_mac.mm -@@ -214,6 +214,12 @@ void OnCompositingShuttingDown(ui::Compositor* compositor) override {} +@@ -214,6 +214,12 @@ BrowserCompositorMac::~BrowserCompositorMac() { g_spare_recyclable_compositors.Get().clear(); } @@ -33,7 +33,7 @@ index 8e98fb37c1d4..8dc887eac61b 100644 gfx::AcceleratedWidget BrowserCompositorMac::GetAcceleratedWidget() { if (recyclable_compositor_) { return recyclable_compositor_->accelerated_widget_mac() -@@ -473,10 +479,16 @@ void OnCompositingShuttingDown(ui::Compositor* compositor) override {} +@@ -473,10 +479,16 @@ void BrowserCompositorMac::GetViewProperties( NSView* ns_view = accelerated_widget_mac_ns_view_->AcceleratedWidgetGetNSView(); if (bounds_in_dip) { @@ -56,7 +56,7 @@ diff --git ui/accelerated_widget_mac/accelerated_widget_mac.mm ui/accelerated_wi index 7ff59beee63c..48efe5ac93fa 100644 --- ui/accelerated_widget_mac/accelerated_widget_mac.mm +++ ui/accelerated_widget_mac/accelerated_widget_mac.mm -@@ -66,6 +66,10 @@ - (void)setContentsChanged; +@@ -66,6 +66,10 @@ void AcceleratedWidgetMac::SetNSView(AcceleratedWidgetMacNSView* view) { DCHECK(view && !view_); view_ = view; diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index c13cb068c..131d10625 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc -index c83e5babe405..92efd9e12561 100644 +index cb122b1bcdb3..bda0309a6225 100644 --- content/browser/browser_plugin/browser_plugin_guest.cc +++ content/browser/browser_plugin/browser_plugin_guest.cc -@@ -339,8 +339,11 @@ void BrowserPluginGuest::InitInternal( +@@ -340,8 +340,11 @@ void BrowserPluginGuest::InitInternal( static_cast(GetWebContents()->GetView()); } @@ -15,7 +15,7 @@ index c83e5babe405..92efd9e12561 100644 // Once a BrowserPluginGuest has an embedder WebContents, it's considered to // be attached. -@@ -836,10 +839,19 @@ void BrowserPluginGuest::OnWillAttachComplete( +@@ -837,10 +840,19 @@ void BrowserPluginGuest::OnWillAttachComplete( static_cast(GetWebContents()->GetView()); if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) { web_contents_view->CreateViewForWidget( diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index bef69267f..addd17470 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 472d5ea34687..575960cb4a37 100644 +index c61e8b60b4c4..694ebd91349b 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -7,6 +7,7 @@ import("//build/config/crypto.gni") diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index a43081619..fae35b8ab 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -93,10 +93,10 @@ index 89a41274745c..586864a9d827 100644 } diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc -index fc3412cb2680..385a7c591689 100644 +index 1879ab630973..caf65b0fcf3d 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc -@@ -1499,6 +1499,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( +@@ -1517,6 +1517,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( if (navigation_handle_) { navigation_handle_->set_net_error_code( static_cast(params.error_code)); @@ -104,7 +104,7 @@ index fc3412cb2680..385a7c591689 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -3515,9 +3516,9 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -3532,9 +3533,9 @@ void RenderFrameHostImpl::CommitNavigation( // however only do this for cross-document navigations, because the // alternative would be redundant effort. network::mojom::URLLoaderFactoryPtr default_factory; @@ -117,7 +117,7 @@ index fc3412cb2680..385a7c591689 100644 if (subresource_loader_params && subresource_loader_params->loader_factory_info.is_valid()) { // If the caller has supplied a default URLLoaderFactory override (for -@@ -3652,9 +3653,9 @@ void RenderFrameHostImpl::FailedNavigation( +@@ -3670,9 +3671,9 @@ void RenderFrameHostImpl::FailedNavigation( // completing an unload handler. ResetWaitingState(); @@ -263,7 +263,7 @@ index e6de4ca6c8b3..18eea4948e43 100644 const std::string& mime_type, bool allow_wildcard, diff --git content/common/frame_messages.h content/common/frame_messages.h -index 7bce348a78d4..bc27dbcdda37 100644 +index 3e4b79cce1af..081366a36f65 100644 --- content/common/frame_messages.h +++ content/common/frame_messages.h @@ -1342,8 +1342,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, @@ -377,7 +377,7 @@ index aa77b86eee98..097d26a80aa9 100644 virtual void FocusedNodeChanged(const blink::WebNode& node) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index f341fb4aec24..28f3105f15c0 100644 +index 03f713d5ff94..bb971481bf80 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc @@ -3468,7 +3468,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -400,7 +400,7 @@ index f341fb4aec24..28f3105f15c0 100644 void RenderFrameImpl::WillCommitProvisionalLoad() { diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index f55d956f05ec..ec2292acb1c3 100644 +index d5f3d130b634..aaa9d6a79306 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc @@ -822,6 +822,8 @@ void RenderThreadImpl::Init( diff --git a/patch/patches/crashpad_1995.patch b/patch/patches/crashpad_1995.patch index e178e46e6..222fe47b3 100644 --- a/patch/patches/crashpad_1995.patch +++ b/patch/patches/crashpad_1995.patch @@ -1,5 +1,5 @@ diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc -index 5e0eabb..f862908 100644 +index 5e0eabb4f300..f862908f285c 100644 --- chrome/common/crash_keys.cc +++ chrome/common/crash_keys.cc @@ -4,6 +4,8 @@ @@ -30,7 +30,7 @@ index 5e0eabb..f862908 100644 void SetActiveExtensions(const std::set& extensions) { diff --git chrome/common/crash_keys.h chrome/common/crash_keys.h -index a18c8fc..011bcc2 100644 +index a18c8fc12b08..011bcc2e8d3f 100644 --- chrome/common/crash_keys.h +++ chrome/common/crash_keys.h @@ -16,6 +16,10 @@ class CommandLine; @@ -45,7 +45,7 @@ index a18c8fc..011bcc2 100644 // Sets the kNumSwitches key and the set of keys named using kSwitchFormat based // on the given |command_line|. diff --git chrome_elf/BUILD.gn chrome_elf/BUILD.gn -index fd5a28b..df46cb0 100644 +index fd5a28b120ea..df46cb0e0033 100644 --- chrome_elf/BUILD.gn +++ chrome_elf/BUILD.gn @@ -7,6 +7,7 @@ @@ -93,7 +93,7 @@ index fd5a28b..df46cb0 100644 static_library("hook_util") { diff --git chrome_elf/crash/crash_helper.cc chrome_elf/crash/crash_helper.cc -index e8e27dc..7cb2149 100644 +index e8e27dc4ebd7..7cb2149ec41d 100644 --- chrome_elf/crash/crash_helper.cc +++ chrome_elf/crash/crash_helper.cc @@ -11,12 +11,17 @@ @@ -127,7 +127,7 @@ index e8e27dc..7cb2149 100644 g_crash_helper_enabled = true; return true; diff --git components/crash/content/app/breakpad_linux.cc components/crash/content/app/breakpad_linux.cc -index c72cd36..e9a79dd 100644 +index c72cd3622b86..e9a79dd47855 100644 --- components/crash/content/app/breakpad_linux.cc +++ components/crash/content/app/breakpad_linux.cc @@ -28,6 +28,7 @@ @@ -227,7 +227,7 @@ index c72cd36..e9a79dd 100644 void InitNonBrowserCrashReporterForAndroid(const std::string& process_type) { SanitizationInfo sanitization_info; diff --git components/crash/content/app/breakpad_linux.h components/crash/content/app/breakpad_linux.h -index 9ee8555..7af55dd 100644 +index 9ee85554812c..7af55ddda8fe 100644 --- components/crash/content/app/breakpad_linux.h +++ components/crash/content/app/breakpad_linux.h @@ -19,6 +19,9 @@ extern void InitCrashReporter(const std::string& process_type); @@ -241,7 +241,7 @@ index 9ee8555..7af55dd 100644 extern void InitCrashKeysForTesting(); diff --git components/crash/content/app/crash_reporter_client.cc components/crash/content/app/crash_reporter_client.cc -index a37619c..e13a0f7 100644 +index a37619c815e3..e13a0f7ade86 100644 --- components/crash/content/app/crash_reporter_client.cc +++ components/crash/content/app/crash_reporter_client.cc @@ -88,11 +88,12 @@ int CrashReporterClient::GetResultCodeRespawnFailed() { @@ -315,7 +315,7 @@ index a37619c..e13a0f7 100644 } // namespace crash_reporter diff --git components/crash/content/app/crash_reporter_client.h components/crash/content/app/crash_reporter_client.h -index 75d3d6d..aa86f45 100644 +index 75d3d6d93873..aa86f45c9746 100644 --- components/crash/content/app/crash_reporter_client.h +++ components/crash/content/app/crash_reporter_client.h @@ -5,7 +5,9 @@ @@ -343,14 +343,14 @@ index 75d3d6d..aa86f45 100644 virtual base::FilePath GetReporterLogFilename(); // Custom crash minidump handler after the minidump is generated. -@@ -106,6 +109,7 @@ class CrashReporterClient { +@@ -105,6 +108,7 @@ class CrashReporterClient { + // WARNING: this handler runs in a compromised context. It may not call into // libc nor allocate memory normally. virtual bool HandleCrashDump(const char* crashdump_filename); - #endif +#endif + #endif // The location where minidump files should be written. Returns true if - // |crash_dir| was set. Windows has to use base::string16 because this code @@ -180,6 +184,30 @@ class CrashReporterClient { // Returns true if breakpad should run in the given process type. @@ -383,7 +383,7 @@ index 75d3d6d..aa86f45 100644 } // namespace crash_reporter diff --git components/crash/content/app/crashpad.cc components/crash/content/app/crashpad.cc -index dde11ea..1a1f8b0 100644 +index dde11eab445d..1a1f8b01215f 100644 --- components/crash/content/app/crashpad.cc +++ components/crash/content/app/crashpad.cc @@ -133,7 +133,8 @@ void InitializeCrashpadImpl(bool initial_client, @@ -397,7 +397,7 @@ index dde11ea..1a1f8b0 100644 ->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled); } diff --git components/crash/content/app/crashpad_mac.mm components/crash/content/app/crashpad_mac.mm -index 6508c2a..f51ce5a 100644 +index 6508c2a06760..f51ce5a17e63 100644 --- components/crash/content/app/crashpad_mac.mm +++ components/crash/content/app/crashpad_mac.mm @@ -16,11 +16,14 @@ @@ -498,7 +498,7 @@ index 6508c2a..f51ce5a 100644 handler_path, database_path, metrics_path, url, process_annotations, arguments, true, false); diff --git components/crash/content/app/crashpad_win.cc components/crash/content/app/crashpad_win.cc -index a5d1afc..91815d9 100644 +index a5d1afc409f4..91815d949f2e 100644 --- components/crash/content/app/crashpad_win.cc +++ components/crash/content/app/crashpad_win.cc @@ -34,8 +34,8 @@ void GetPlatformCrashpadAnnotations( @@ -568,7 +568,7 @@ index a5d1afc..91815d9 100644 if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) { diff --git content/browser/frame_host/debug_urls.cc content/browser/frame_host/debug_urls.cc -index 4695432..62a7ce8 100644 +index 46954327b9c7..62a7ce8d4e46 100644 --- content/browser/frame_host/debug_urls.cc +++ content/browser/frame_host/debug_urls.cc @@ -139,7 +139,9 @@ bool HandleDebugURL(const GURL& url, ui::PageTransition transition) { diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index d20b504b3..e22b380a2 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 3263eb9e324a..b5bde4cea8f7 100644 +index 3866f423e1b5..efe77f976617 100644 --- content/browser/frame_host/render_frame_host_manager.cc +++ content/browser/frame_host/render_frame_host_manager.cc @@ -890,10 +890,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( diff --git a/patch/patches/linux_build.patch b/patch/patches/linux_build.patch index 8240e2128..62d879cdf 100644 --- a/patch/patches/linux_build.patch +++ b/patch/patches/linux_build.patch @@ -12,7 +12,7 @@ index 2673c6a79889..ca5726966ac0 100644 ldflags += [ "-Wl,--icf=all" ] } diff --git chrome/browser/ui/libgtkui/gtk_util.cc chrome/browser/ui/libgtkui/gtk_util.cc -index fc6ffb9d..f6c22e5 100644 +index fc6ffb9d2eb1..f6c22e57392c 100644 --- chrome/browser/ui/libgtkui/gtk_util.cc +++ chrome/browser/ui/libgtkui/gtk_util.cc @@ -56,6 +56,7 @@ void CommonInitFromCommandLine(const base::CommandLine& command_line, diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index d1d4921fd..382ea1556 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -11,7 +11,7 @@ index a714130a50d8..2a835d7282b3 100644 IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop) IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled) diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc -index 06069a576dfd..912155ebec7c 100644 +index dea164853646..f3b69c6b81c9 100644 --- content/public/common/web_preferences.cc +++ content/public/common/web_preferences.cc @@ -178,6 +178,7 @@ WebPreferences::WebPreferences() @@ -35,10 +35,10 @@ index 49be57cd2aad..417be7a55184 100644 bool record_whole_document; SavePreviousDocumentResources save_previous_document_resources; diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc -index 1d136aa56ff4..23c00d73b8ed 100644 +index 6b128219c76a..d6396b810c11 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc -@@ -1261,6 +1261,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( +@@ -1263,6 +1263,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( blink::WebView* web_view, CompositorDependencies* compositor_deps) { ApplyWebPreferences(prefs, web_view); diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index b7456b910..0017b2560 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -171,10 +171,10 @@ index 11eb1d3b732a..52962a868999 100644 weak_factory_.GetWeakPtr(), site_url, tab_url, tab_referrer_url), base::BindOnce(&DownloadManagerImpl::AddUrlDownloadHandler, diff --git content/browser/loader/navigation_url_loader_network_service.cc content/browser/loader/navigation_url_loader_network_service.cc -index d9297fa8365e..38a3fb629a7a 100644 +index f222194d970f..3c7fd1009494 100644 --- content/browser/loader/navigation_url_loader_network_service.cc +++ content/browser/loader/navigation_url_loader_network_service.cc -@@ -868,11 +868,12 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService( +@@ -888,11 +888,12 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService( .PassInterface(); } @@ -220,7 +220,7 @@ index b9d2670514c0..004939aa055a 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index 22c72f3ac929..c12815670521 100644 +index 0e57990b06a1..494a64798a1a 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -497,9 +497,8 @@ class SpareRenderProcessHostManager : public RenderProcessHostObserver { @@ -492,19 +492,16 @@ index 01ba96322f69..6dde251b3d1b 100644 parameterized_binder_registry_.AddInterface( base::BindRepeating(&BackgroundFetchServiceImpl::Create)); diff --git content/browser/shared_worker/shared_worker_connector_impl.cc content/browser/shared_worker/shared_worker_connector_impl.cc -index 1e95910e7168..45adb88b1e96 100644 +index adcc28c72119..96fef4e3099e 100644 --- content/browser/shared_worker/shared_worker_connector_impl.cc +++ content/browser/shared_worker/shared_worker_connector_impl.cc -@@ -34,10 +34,9 @@ void SharedWorkerConnectorImpl::Connect( - mojom::SharedWorkerClientPtr client, - blink::mojom::SharedWorkerCreationContextType creation_context_type, - mojo::ScopedMessagePipeHandle message_port) { -- SharedWorkerServiceImpl* service = -- static_cast( -- RenderProcessHost::FromID(process_id_)->GetStoragePartition()) +@@ -41,8 +41,8 @@ void SharedWorkerConnectorImpl::Connect( + return; + } + SharedWorkerServiceImpl* service = +- static_cast(host->GetStoragePartition()) - ->GetSharedWorkerService(); -+ SharedWorkerServiceImpl* service = static_cast( -+ RenderProcessHost::FromID(process_id_)->GetStoragePartition() ++ static_cast(host->GetStoragePartition() + ->GetSharedWorkerService()); service->ConnectToWorker(process_id_, frame_id_, std::move(info), std::move(client), creation_context_type, diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 6ea9b3c89..0cc94b630 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -17,18 +17,19 @@ index 8088169f0434..47cf612db044 100644 .Top() .GetSecurityContext() diff --git third_party/WebKit/Source/core/exported/WebDevToolsAgentImpl.cpp third_party/WebKit/Source/core/exported/WebDevToolsAgentImpl.cpp -index 0fa2449c7f1c..8adf2d575e66 100644 +index 9b0ec7152d34..09a7901bf526 100644 --- third_party/WebKit/Source/core/exported/WebDevToolsAgentImpl.cpp +++ third_party/WebKit/Source/core/exported/WebDevToolsAgentImpl.cpp -@@ -329,6 +329,7 @@ WebDevToolsAgentImpl::Session::Session( - host_ptr_.Bind(std::move(host_ptr_info)); - host_ptr_.set_connection_error_handler(WTF::Bind( +@@ -330,6 +330,8 @@ WebDevToolsAgentImpl::Session::Session( &WebDevToolsAgentImpl::Session::Detach, WrapWeakPersistent(this))); + + InitializeInspectorSession(reattach_state); ++ + Platform::Current()->DevToolsAgentAttached(); } - void WebDevToolsAgentImpl::Session::Trace(blink::Visitor* visitor) { -@@ -347,6 +348,7 @@ void WebDevToolsAgentImpl::Session::Detach() { + WebDevToolsAgentImpl::Session::~Session() { +@@ -354,6 +356,7 @@ void WebDevToolsAgentImpl::Session::Detach() { io_session_->DeleteSoon(); io_session_ = nullptr; inspector_session_->Dispose(); diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 5d8710f51..37b44dae4 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -1,8 +1,8 @@ diff --git third_party/WebKit/Source/core/exported/WebViewImpl.cpp third_party/WebKit/Source/core/exported/WebViewImpl.cpp -index d0c5134a2ad6..1434134d4212 100644 +index d91e3b143073..35fd90706031 100644 --- third_party/WebKit/Source/core/exported/WebViewImpl.cpp +++ third_party/WebKit/Source/core/exported/WebViewImpl.cpp -@@ -258,8 +258,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { +@@ -253,8 +253,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { g_should_use_external_popup_menus = use_external_popup_menus; } @@ -18,7 +18,7 @@ index d0c5134a2ad6..1434134d4212 100644 } namespace { -@@ -350,6 +355,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, +@@ -345,6 +350,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, enable_fake_page_scale_animation_for_testing_(false), fake_page_scale_animation_page_scale_factor_(0), fake_page_scale_animation_use_anchor_(false), @@ -27,11 +27,11 @@ index d0c5134a2ad6..1434134d4212 100644 suppress_next_keypress_event_(false), ime_accept_events_(true), diff --git third_party/WebKit/Source/core/exported/WebViewImpl.h third_party/WebKit/Source/core/exported/WebViewImpl.h -index 79a702679fec..f50dca632eb4 100644 +index a17a3af5ec27..7036d8e87ba0 100644 --- third_party/WebKit/Source/core/exported/WebViewImpl.h +++ third_party/WebKit/Source/core/exported/WebViewImpl.h -@@ -107,7 +107,8 @@ class CORE_EXPORT WebViewImpl final - static const WebInputEvent* CurrentInputEvent(); +@@ -106,7 +106,8 @@ class CORE_EXPORT WebViewImpl final + static HashSet& AllInstances(); // Returns true if popup menus should be rendered by the browser, false if // they should be rendered by WebKit (which is the default). - static bool UseExternalPopupMenus(); @@ -40,7 +40,7 @@ index 79a702679fec..f50dca632eb4 100644 // WebWidget methods: void Close() override; -@@ -608,6 +609,8 @@ class CORE_EXPORT WebViewImpl final +@@ -605,6 +606,8 @@ class CORE_EXPORT WebViewImpl final float fake_page_scale_animation_page_scale_factor_; bool fake_page_scale_animation_use_anchor_;