bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 86.0.4240.68

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-10-01 23:59:23 -04:00
parent d77d73050c
commit d33ff7fe6a
14 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/86.0.4240.22', 'chromium_checkout': 'refs/tags/86.0.4240.68',
'depot_tools_checkout': '5dba9c97fb' 'depot_tools_checkout': '5dba9c97fb'
} }

4
patch/patches/build.patch
View File

@@ -1,8 +1,8 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index 8166e38ceda5..178099b1ac62 100644 index bafffe27168d..9ab64460ae3c 100644
--- build/config/compiler/BUILD.gn --- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn
@@ -1767,8 +1767,6 @@ config("thin_archive") { @@ -1771,8 +1771,6 @@ config("thin_archive") {
# archive names to 16 characters, which is not what we want). # archive names to 16 characters, which is not what we want).
if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
arflags = [ "-T" ] arflags = [ "-T" ]

8
patch/patches/chrome_browser.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index d5b479bc9991..fa144b20ce37 100644 index 98ae3acaf7cf..f9a7ec7f44b4 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni") @@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
@@ -29,7 +29,7 @@ index d5b479bc9991..fa144b20ce37 100644
if (is_android) { if (is_android) {
sources += [ sources += [
"after_startup_task_utils_android.cc", "after_startup_task_utils_android.cc",
@@ -3422,8 +3428,6 @@ static_library("browser") { @@ -3424,8 +3430,6 @@ static_library("browser") {
"nearby_sharing/outgoing_share_target_info.h", "nearby_sharing/outgoing_share_target_info.h",
"nearby_sharing/paired_key_verification_runner.cc", "nearby_sharing/paired_key_verification_runner.cc",
"nearby_sharing/paired_key_verification_runner.h", "nearby_sharing/paired_key_verification_runner.h",
@@ -38,11 +38,13 @@ index d5b479bc9991..fa144b20ce37 100644
"nearby_sharing/share_target_discovered_callback.h", "nearby_sharing/share_target_discovered_callback.h",
"nearby_sharing/share_target_info.cc", "nearby_sharing/share_target_info.cc",
"nearby_sharing/share_target_info.h", "nearby_sharing/share_target_info.h",
@@ -3617,13 +3621,6 @@ static_library("browser") { @@ -3619,15 +3623,6 @@ static_library("browser") {
"serial/serial_chooser_context_factory.cc", "serial/serial_chooser_context_factory.cc",
"serial/serial_chooser_context_factory.h", "serial/serial_chooser_context_factory.h",
"serial/serial_chooser_histograms.h", "serial/serial_chooser_histograms.h",
- "sharesheet/sharesheet_controller.h", - "sharesheet/sharesheet_controller.h",
- "sharesheet/sharesheet_metrics.cc",
- "sharesheet/sharesheet_metrics.h",
- "sharesheet/sharesheet_service.cc", - "sharesheet/sharesheet_service.cc",
- "sharesheet/sharesheet_service.h", - "sharesheet/sharesheet_service.h",
- "sharesheet/sharesheet_service_delegate.cc", - "sharesheet/sharesheet_service_delegate.cc",

16
patch/patches/chrome_runtime.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index 313975f42c0d..ee7f27dab6b7 100644 index 3e8b70c47bd2..185f98eceb6c 100644
--- chrome/app/chrome_main_delegate.cc --- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
@@ -19,7 +19,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
#if defined(OS_WIN) #if defined(OS_WIN)
// Reach out to chrome_elf for the truth on the user data directory. // Reach out to chrome_elf for the truth on the user data directory.
// Note that in tests, this links to chrome_elf_test_stubs. // Note that in tests, this links to chrome_elf_test_stubs.
@@ -624,7 +627,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() { @@ -630,7 +633,9 @@ void ChromeMainDelegate::PostFieldTrialInitialization() {
} }
#if defined(OS_WIN) #if defined(OS_WIN)
@@ -29,7 +29,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
base::sequence_manager::internal::ThreadControllerPowerMonitor:: base::sequence_manager::internal::ThreadControllerPowerMonitor::
InitializeOnMainThread(); InitializeOnMainThread();
#endif #endif
@@ -906,6 +911,7 @@ void ChromeMainDelegate::PreSandboxStartup() { @@ -912,6 +917,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type = std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType); command_line.GetSwitchValueASCII(switches::kProcessType);
@@ -37,7 +37,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
crash_reporter::InitializeCrashKeys(); crash_reporter::InitializeCrashKeys();
#if defined(OS_POSIX) #if defined(OS_POSIX)
@@ -916,6 +922,7 @@ void ChromeMainDelegate::PreSandboxStartup() { @@ -922,6 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitMacCrashReporter(command_line, process_type); InitMacCrashReporter(command_line, process_type);
SetUpInstallerPreferences(command_line); SetUpInstallerPreferences(command_line);
#endif #endif
@@ -45,7 +45,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
#if defined(OS_WIN) #if defined(OS_WIN)
child_process_logging::Init(); child_process_logging::Init();
@@ -1040,6 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() { @@ -1046,6 +1053,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale; locale;
} }
@@ -53,7 +53,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
#if defined(OS_POSIX) && !defined(OS_MAC) #if defined(OS_POSIX) && !defined(OS_MAC)
// Zygote needs to call InitCrashReporter() in RunZygote(). // Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != service_manager::switches::kZygoteProcess) { if (process_type != service_manager::switches::kZygoteProcess) {
@@ -1072,6 +1080,7 @@ void ChromeMainDelegate::PreSandboxStartup() { @@ -1078,6 +1086,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
// After all the platform Breakpads have been initialized, store the command // After all the platform Breakpads have been initialized, store the command
// line for crash reporting. // line for crash reporting.
crash_keys::SetCrashKeysFromCommandLine(command_line); crash_keys::SetCrashKeysFromCommandLine(command_line);
@@ -61,7 +61,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
#if BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(ENABLE_PDF)
MaybeInitializeGDI(); MaybeInitializeGDI();
@@ -1170,6 +1179,7 @@ void ChromeMainDelegate::ZygoteForked() { @@ -1176,6 +1185,7 @@ void ChromeMainDelegate::ZygoteForked() {
SetUpProfilingShutdownHandler(); SetUpProfilingShutdownHandler();
} }
@@ -69,7 +69,7 @@ index 313975f42c0d..ee7f27dab6b7 100644
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
// this up for the browser process in a different manner. // this up for the browser process in a different manner.
const base::CommandLine* command_line = const base::CommandLine* command_line =
@@ -1186,6 +1196,7 @@ void ChromeMainDelegate::ZygoteForked() { @@ -1192,6 +1202,7 @@ void ChromeMainDelegate::ZygoteForked() {
// Reset the command line for the newly spawned process. // Reset the command line for the newly spawned process.
crash_keys::SetCrashKeysFromCommandLine(*command_line); crash_keys::SetCrashKeysFromCommandLine(*command_line);

2
patch/patches/content_2015.patch
View File

@@ -340,7 +340,7 @@ index 5b0784c844bd..a7b6d3f3c237 100644
// started. // started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 16a16b1f075d..94942f76489c 100644 index c110db6a32bb..a823bbb57f89 100644
--- content/renderer/render_frame_impl.cc --- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc
@@ -3853,7 +3853,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -3853,7 +3853,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(

6
patch/patches/prefs_content_1161.patch
View File

@@ -23,7 +23,7 @@ index 839e3cbde987..ef1b0d7be31f 100644
record_whole_document(false), record_whole_document(false),
cookie_enabled(true), cookie_enabled(true),
diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h
index 700b47b5f521..4cd1cdceaf42 100644 index 9262a32ce209..b4c9e32b6e69 100644
--- content/public/common/web_preferences.h --- content/public/common/web_preferences.h
+++ content/public/common/web_preferences.h +++ content/public/common/web_preferences.h
@@ -179,6 +179,7 @@ struct CONTENT_EXPORT WebPreferences { @@ -179,6 +179,7 @@ struct CONTENT_EXPORT WebPreferences {
@@ -35,10 +35,10 @@ index 700b47b5f521..4cd1cdceaf42 100644
bool record_whole_document; bool record_whole_document;
diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
index 49619a9b5683..52e09111aad3 100644 index 2852dec8eaf5..881c75a45b2b 100644
--- content/renderer/render_view_impl.cc --- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc
@@ -950,6 +950,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, @@ -951,6 +951,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
#endif #endif
WebRuntimeFeatures::EnableTranslateService(prefs.translate_service_available); WebRuntimeFeatures::EnableTranslateService(prefs.translate_service_available);

4
patch/patches/renderer_host_1070713.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
index 4f914119d21b..5be76fbbda36 100644 index 3c75954bdcff..7c2c1909d22c 100644
--- content/browser/renderer_host/render_view_host_impl.cc --- content/browser/renderer_host/render_view_host_impl.cc
+++ content/browser/renderer_host/render_view_host_impl.cc +++ content/browser/renderer_host/render_view_host_impl.cc
@@ -522,6 +522,8 @@ bool RenderViewHostImpl::IsRenderViewLive() { @@ -521,6 +521,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
} }
void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {

6
patch/patches/renderer_preferences_util_545103.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
index 0acace592ca4..66cc3c360b79 100644 index 7ba5b3d1abfe..da7580782644 100644
--- chrome/browser/renderer_preferences_util.cc --- chrome/browser/renderer_preferences_util.cc
+++ chrome/browser/renderer_preferences_util.cc +++ chrome/browser/renderer_preferences_util.cc
@@ -33,7 +33,8 @@ @@ -34,7 +34,8 @@
#include "ui/base/cocoa/defaults_utils.h" #include "ui/base/cocoa/defaults_utils.h"
#endif #endif
@@ -12,7 +12,7 @@ index 0acace592ca4..66cc3c360b79 100644
#include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h" #include "ui/views/linux_ui/linux_ui.h"
@@ -155,7 +156,8 @@ void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs, @@ -162,7 +163,8 @@ void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs,
prefs->caret_blink_interval = interval; prefs->caret_blink_interval = interval;
#endif #endif

6
patch/patches/services_network_2622.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index e5160aa3ff1a..87b037e517c2 100644 index 5630448c45aa..92f675e09856 100644
--- chrome/browser/net/profile_network_context_service.cc --- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
@@ -10,7 +10,7 @@ index e5160aa3ff1a..87b037e517c2 100644
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/cookie_settings_factory.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ -668,9 +669,23 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( @@ -669,9 +670,23 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
network_context_params->cookie_manager_params = network_context_params->cookie_manager_params =
CreateCookieManagerParams(profile_, *cookie_settings_); CreateCookieManagerParams(profile_, *cookie_settings_);
@@ -35,7 +35,7 @@ index e5160aa3ff1a..87b037e517c2 100644
PrefService* local_state = g_browser_process->local_state(); PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size. // Configure the HTTP cache path and size.
base::FilePath base_cache_path; base::FilePath base_cache_path;
@@ -683,7 +698,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( @@ -684,7 +699,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
base_cache_path.Append(chrome::kCacheDirname); base_cache_path.Append(chrome::kCacheDirname);
network_context_params->http_cache_max_size = network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize); local_state->GetInteger(prefs::kDiskCacheSize);

2
patch/patches/services_network_2718.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index eead3ac6a092..372c511b6c77 100644 index 6996fe8d1be3..3bd057c7d316 100644
--- content/browser/storage_partition_impl.cc --- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc
@@ -487,10 +487,6 @@ class LoginHandlerDelegate { @@ -487,10 +487,6 @@ class LoginHandlerDelegate {

2
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@@ -73,7 +73,7 @@ index af80b343dcd9..507618362acd 100644
FRIEND_TEST_ALL_PREFIXES( FRIEND_TEST_ALL_PREFIXES(
BrowserSideFlingBrowserTest, BrowserSideFlingBrowserTest,
diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
index 44586cc1789a..18705ef4e6e7 100644 index 51342ad75c8d..597b0c67af47 100644
--- content/browser/renderer_host/render_widget_host_view_event_handler.cc --- content/browser/renderer_host/render_widget_host_view_event_handler.cc
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -37,6 +37,10 @@ @@ -37,6 +37,10 @@

14
patch/patches/web_contents_1257_1565.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 5c0eea105870..1c82c2d0be99 100644 index 1eadb3f0dace..4316de630cef 100644
--- content/browser/web_contents/web_contents_impl.cc --- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc
@@ -2578,15 +2578,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2582,15 +2582,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name; std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -33,7 +33,7 @@ index 5c0eea105870..1c82c2d0be99 100644
} }
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -3385,6 +3392,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow( @@ -3389,6 +3396,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
// objects. // objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance; create_params.renderer_initiated_creation = !is_new_browsing_instance;
@@ -49,7 +49,7 @@ index 5c0eea105870..1c82c2d0be99 100644
std::unique_ptr<WebContentsImpl> new_contents; std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) { if (!is_guest) {
create_params.context = view_->GetNativeView(); create_params.context = view_->GetNativeView();
@@ -6884,6 +6900,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, @@ -6910,6 +6926,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents. // This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary(); SetAsFocusedWebContentsIfNecessary();
} }
@@ -73,7 +73,7 @@ index f1dcf53ea481..192f7c0ddd04 100644
WebContents::CreateParams::CreateParams(const CreateParams& other) = default; WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index 9d5bc0a3e914..57f2e66ea415 100644 index e282d97d9b0f..af6eb6506fb8 100644
--- content/public/browser/web_contents.h --- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h +++ content/public/browser/web_contents.h
@@ -83,8 +83,10 @@ class BrowserContext; @@ -83,8 +83,10 @@ class BrowserContext;
@@ -131,10 +131,10 @@ index a10c5caf5a4b..ef8d3c3c1056 100644
// typically happens when popups are created. // typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents, virtual void WebContentsCreated(WebContents* source_contents,
diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
index 3666e0357038..b82c54816894 100644 index 301fa10bcc3e..37ec8ddd4583 100644
--- content/public/browser/web_contents_observer.h --- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h
@@ -610,6 +610,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener { @@ -613,6 +613,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
// WebContents has gained/lost focus. // WebContents has gained/lost focus.
virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {} virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}

4
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -44,10 +44,10 @@ index ba112d79de9a..83f5bd971bc9 100644
DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) { DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) {
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 3d86affee6ad..1d29b9622763 100644 index 6120b85a4c1a..6b1943e11ce1 100644
--- third_party/blink/renderer/core/frame/local_frame.cc --- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1647,7 +1647,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { @@ -1652,7 +1652,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
PluginData* LocalFrame::GetPluginData() const { PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr; return nullptr;

8
patch/patches/webkit_popups.patch
View File

@@ -11,7 +11,7 @@ index 4d55813fed92..f41bd4b5590e 100644
// Cancels and hides the current popup (datetime, select...) if any. // Cancels and hides the current popup (datetime, select...) if any.
virtual void CancelPagePopup() = 0; virtual void CancelPagePopup() = 0;
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index cafd4891c5ba..82c9bf7c917e 100644 index 54481b3341be..ec210d3be86b 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc --- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -216,8 +216,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -216,8 +216,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -30,7 +30,7 @@ index cafd4891c5ba..82c9bf7c917e 100644
} }
namespace { namespace {
@@ -323,6 +328,7 @@ WebViewImpl::WebViewImpl( @@ -325,6 +330,7 @@ WebViewImpl::WebViewImpl(
chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)), chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)), minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)), maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
@@ -39,7 +39,7 @@ index cafd4891c5ba..82c9bf7c917e 100644
fullscreen_controller_(std::make_unique<FullscreenController>(this)), fullscreen_controller_(std::make_unique<FullscreenController>(this)),
receiver_(this, std::move(page_handle)) { receiver_(this, std::move(page_handle)) {
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index b9256a87fdba..e7eaa9a2e448 100644 index 15e2c9b2bb75..8d2fe1676ba8 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h --- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -125,7 +125,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -125,7 +125,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -52,7 +52,7 @@ index b9256a87fdba..e7eaa9a2e448 100644
// Returns whether frames under this WebView are backed by a compositor. // Returns whether frames under this WebView are backed by a compositor.
bool does_composite() const { return does_composite_; } bool does_composite() const { return does_composite_; }
@@ -650,6 +651,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -652,6 +653,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_ = 0.f; float fake_page_scale_animation_page_scale_factor_ = 0.f;
bool fake_page_scale_animation_use_anchor_ = false; bool fake_page_scale_animation_use_anchor_ = false;