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 74.0.3729.108

Browse Source
This commit is contained in:
Marshall Greenblatt
2019-04-24 14:11:39 -04:00
parent 5fa3d519c9
commit 98f22d3b7b
17 changed files with 68 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/74.0.3729.6' 'chromium_checkout': 'refs/tags/74.0.3729.108'
} }

5
patch/patch.cfg
View File

@@ -423,11 +423,6 @@ patches = [
# https://bitbucket.org/chromiumembedded/cef/issues/1936 # https://bitbucket.org/chromiumembedded/cef/issues/1936
'name': 'linux_assets_path_1936', 'name': 'linux_assets_path_1936',
}, },
{
# Windows: Fix jumbo build error in AccessibilityTreeFormatterWin
# https://bugs.chromium.org/p/chromium/issues/detail?id=939668
'name': 'accessibility_win_939668',
},
{ {
# Windows: Revert base::Value change which breaks cef_sandbox build. # Windows: Revert base::Value change which breaks cef_sandbox build.
# https://bugs.chromium.org/p/chromium/issues/detail?id=646113#c173 # https://bugs.chromium.org/p/chromium/issues/detail?id=646113#c173

31
patch/patches/accessibility_win_939668.patch
View File

@@ -1,31 +0,0 @@
diff --git content/browser/accessibility/accessibility_tree_formatter_win.cc content/browser/accessibility/accessibility_tree_formatter_win.cc
index 59f85adf85c3..a60cb7aa874c 100644
--- content/browser/accessibility/accessibility_tree_formatter_win.cc
+++ content/browser/accessibility/accessibility_tree_formatter_win.cc
@@ -35,7 +35,7 @@
#include "ui/base/win/atl_module.h"
#include "ui/gfx/win/hwnd_util.h"
-namespace {
+namespace internal {
struct HwndWithProcId {
HwndWithProcId(const base::ProcessId id) : pid(id), hwnd(nullptr) {}
@@ -60,7 +60,7 @@ HWND GetHwndForProcess(base::ProcessId pid) {
return hwnd_with_proc_id.hwnd;
}
-} // namespace
+} // namespace internal
namespace content {
@@ -354,7 +354,7 @@ std::unique_ptr<base::DictionaryValue>
AccessibilityTreeFormatterWin::BuildAccessibilityTreeForProcess(
base::ProcessId pid) {
// Get HWND for process id.
- HWND hwnd = GetHwndForProcess(pid);
+ HWND hwnd = ::internal::GetHwndForProcess(pid);
return BuildAccessibilityTreeForWindow(hwnd);
}

2
patch/patches/browser_child_frame_2507.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_child_frame.cc content/browser/renderer_host/render_widget_host_view_child_frame.cc diff --git content/browser/renderer_host/render_widget_host_view_child_frame.cc content/browser/renderer_host/render_widget_host_view_child_frame.cc
index 1e2a66d449be..639bb2096cf4 100644 index eef13b593cfa..f157f6e54279 100644
--- content/browser/renderer_host/render_widget_host_view_child_frame.cc --- content/browser/renderer_host/render_widget_host_view_child_frame.cc
+++ content/browser/renderer_host/render_widget_host_view_child_frame.cc +++ content/browser/renderer_host/render_widget_host_view_child_frame.cc
@@ -650,6 +650,7 @@ void RenderWidgetHostViewChildFrame::SubmitCompositorFrame( @@ -650,6 +650,7 @@ void RenderWidgetHostViewChildFrame::SubmitCompositorFrame(

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 880d2fdcd2dd..7479901c306e 100644 index 0324e35f2466..a0c9411863d7 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/features.gni") @@ -8,6 +8,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index 880d2fdcd2dd..7479901c306e 100644
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//components/feature_engagement/features.gni") import("//components/feature_engagement/features.gni")
import("//components/feed/features.gni") import("//components/feed/features.gni")
@@ -1814,6 +1815,7 @@ jumbo_split_static_library("browser") { @@ -1812,6 +1813,7 @@ jumbo_split_static_library("browser") {
"//base:i18n", "//base:i18n",
"//base/allocator:buildflags", "//base/allocator:buildflags",
"//cc", "//cc",
@@ -18,7 +18,7 @@ index 880d2fdcd2dd..7479901c306e 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2111,6 +2113,10 @@ jumbo_split_static_library("browser") { @@ -2108,6 +2110,10 @@ jumbo_split_static_library("browser") {
] ]
} }
@@ -29,7 +29,7 @@ index 880d2fdcd2dd..7479901c306e 100644
if (is_android) { if (is_android) {
sources += [ sources += [
"after_startup_task_utils_android.cc", "after_startup_task_utils_android.cc",
@@ -3860,7 +3866,7 @@ jumbo_split_static_library("browser") { @@ -3861,7 +3867,7 @@ jumbo_split_static_library("browser") {
] ]
} }

2
patch/patches/chrome_browser_net_export.patch
View File

@@ -51,7 +51,7 @@ index 7168c719aa25..bae7162a539c 100644
override; override;
network::NetworkQualityTracker* network_quality_tracker() override; network::NetworkQualityTracker* network_quality_tracker() override;
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 911e49e41313..eecbca982a92 100644 index d4ff15d0fcd9..33d5ac2c2321 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/features.gni") @@ -9,6 +9,7 @@ import("//build/config/features.gni")

2
patch/patches/chrome_browser_profiles.patch
View File

@@ -71,7 +71,7 @@ index e8e76ce5b954..1dd338dd0142 100644
content::BrowserContext* GetBrowserContextRedirectedInIncognito( content::BrowserContext* GetBrowserContextRedirectedInIncognito(
content::BrowserContext* context); content::BrowserContext* context);
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index d66a0216832f..25c5ea80cb07 100644 index af40358b9ef2..6d2eef05af5e 100644
--- chrome/browser/profiles/profile_manager.cc --- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc
@@ -384,7 +384,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) @@ -384,7 +384,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)

22
patch/patches/content_2015.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
index 25de1508db60..5fcfffa96b89 100644 index 010f9511741c..a777f2d7a106 100644
--- chrome/browser/download/download_target_determiner.cc --- chrome/browser/download/download_target_determiner.cc
+++ chrome/browser/download/download_target_determiner.cc +++ chrome/browser/download/download_target_determiner.cc
@@ -597,8 +597,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context, @@ -602,8 +602,8 @@ void IsHandledBySafePlugin(content::ResourceContext* resource_context,
content::PluginService* plugin_service = content::PluginService* plugin_service =
content::PluginService::GetInstance(); content::PluginService::GetInstance();
bool plugin_found = plugin_service->GetPluginInfo( bool plugin_found = plugin_service->GetPluginInfo(
@@ -66,7 +66,7 @@ index be77d0e074e9..949873b9bb22 100644
} }
diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
index 1e912186c32c..38d03aafc8b0 100644 index de22d5e48b35..830133d6e49c 100644
--- content/browser/frame_host/navigation_handle_impl.cc --- content/browser/frame_host/navigation_handle_impl.cc
+++ content/browser/frame_host/navigation_handle_impl.cc +++ content/browser/frame_host/navigation_handle_impl.cc
@@ -308,12 +308,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() { @@ -308,12 +308,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
@@ -83,10 +83,10 @@ index 1e912186c32c..38d03aafc8b0 100644
"WillFailRequest state should come before WillProcessResponse"); "WillFailRequest state should come before WillProcessResponse");
return navigation_request_->render_frame_host(); return navigation_request_->render_frame_host();
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index 21f84cc3f922..020017584cd9 100644 index 95fc376f184a..f68d998abcdd 100644
--- content/browser/frame_host/render_frame_host_impl.cc --- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc
@@ -4777,9 +4777,9 @@ void RenderFrameHostImpl::CommitNavigation( @@ -4800,9 +4800,9 @@ void RenderFrameHostImpl::CommitNavigation(
// factories. TODO(kinuko): Consider setting this up only when prefetch // factories. TODO(kinuko): Consider setting this up only when prefetch
// is used. Currently we have this here to make sure we have non-racy // is used. Currently we have this here to make sure we have non-racy
// situation (https://crbug.com/849929). // situation (https://crbug.com/849929).
@@ -255,10 +255,10 @@ index 3009401dac6b..b4c5a9e2db50 100644
}; };
diff --git content/common/frame_messages.h content/common/frame_messages.h diff --git content/common/frame_messages.h content/common/frame_messages.h
index f1b940d02a3e..7ba4495c34b0 100644 index b6800bd3dab4..e726924758c4 100644
--- content/common/frame_messages.h --- content/common/frame_messages.h
+++ content/common/frame_messages.h +++ content/common/frame_messages.h
@@ -1319,9 +1319,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, @@ -1328,9 +1328,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// type. If there is no matching plugin, |found| is false. // type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the // |actual_mime_type| is the actual mime type supported by the
// found plugin. // found plugin.
@@ -334,10 +334,10 @@ index c9ce48e3c3ec..0a3448b194a3 100644
virtual void FocusedNodeChanged(const blink::WebNode& node) {} virtual void FocusedNodeChanged(const blink::WebNode& node) {}
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 b82743edbc63..cae550657487 100644 index ae7ecadddf71..d4c7118da850 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
@@ -3922,7 +3922,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -3940,7 +3940,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type; std::string mime_type;
bool found = false; bool found = false;
Send(new FrameHostMsg_GetPluginInfo( Send(new FrameHostMsg_GetPluginInfo(
@@ -347,7 +347,7 @@ index b82743edbc63..cae550657487 100644
params.mime_type.Utf8(), &found, &info, &mime_type)); params.mime_type.Utf8(), &found, &info, &mime_type));
if (!found) if (!found)
return nullptr; return nullptr;
@@ -4340,6 +4341,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { @@ -4358,6 +4359,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
void RenderFrameImpl::FrameFocused() { void RenderFrameImpl::FrameFocused() {
Send(new FrameHostMsg_FrameFocused(routing_id_)); Send(new FrameHostMsg_FrameFocused(routing_id_));
@@ -357,7 +357,7 @@ index b82743edbc63..cae550657487 100644
void RenderFrameImpl::WillCommitProvisionalLoad() { void RenderFrameImpl::WillCommitProvisionalLoad() {
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 9d029d4ee65b..d5aff5825371 100644 index 44d963793f14..0e345c8a61c3 100644
--- content/renderer/render_thread_impl.cc --- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc
@@ -806,6 +806,8 @@ void RenderThreadImpl::Init() { @@ -806,6 +806,8 @@ void RenderThreadImpl::Init() {

6
patch/patches/extensions_1947.patch
View File

@@ -57,7 +57,7 @@ index cc7c7b4ffab5..24cab4f980a5 100644
// If |new_instance| is a new SiteInstance for a subframe that requires a // If |new_instance| is a new SiteInstance for a subframe that requires a
// dedicated process, set its process reuse policy so that such subframes are // dedicated process, set its process reuse policy so that such subframes are
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 7fc0a70f4e79..96a887d5e8e5 100644 index 009991aa57e8..a31088768f60 100644
--- content/public/browser/content_browser_client.h --- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h
@@ -460,6 +460,13 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -460,6 +460,13 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -74,7 +74,7 @@ index 7fc0a70f4e79..96a887d5e8e5 100644
// Returns true if the passed in URL should be assigned as the site of the // Returns true if the passed in URL should be assigned as the site of the
// current SiteInstance, if it does not yet have a site. // current SiteInstance, if it does not yet have a site.
virtual bool ShouldAssignSiteForURL(const GURL& url); virtual bool ShouldAssignSiteForURL(const GURL& url);
@@ -1491,6 +1498,10 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -1495,6 +1502,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string. // Used as part of the user agent string.
virtual std::string GetProduct() const; virtual std::string GetProduct() const;
@@ -86,7 +86,7 @@ index 7fc0a70f4e79..96a887d5e8e5 100644
virtual std::string GetUserAgent() const; virtual std::string GetUserAgent() const;
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index 0714c63350c8..c1acbd8bd531 100644 index 8cc9503fc131..b74c385b40a2 100644
--- extensions/browser/extension_host.cc --- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc +++ extensions/browser/extension_host.cc
@@ -67,11 +67,12 @@ ExtensionHost::ExtensionHost(const Extension* extension, @@ -67,11 +67,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,

6
patch/patches/external_textures_1006.patch
View File

@@ -984,7 +984,7 @@ index 6955858281e7..045dee3185bf 100644
"buffer_manager.cc", "buffer_manager.cc",
"buffer_manager.h", "buffer_manager.h",
diff --git gpu/command_buffer/service/gles2_cmd_decoder.cc gpu/command_buffer/service/gles2_cmd_decoder.cc diff --git gpu/command_buffer/service/gles2_cmd_decoder.cc gpu/command_buffer/service/gles2_cmd_decoder.cc
index 9f11a25c7ea9..67c119e2400e 100644 index 87220701d86b..0bcb74f19b7a 100644
--- gpu/command_buffer/service/gles2_cmd_decoder.cc --- gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc +++ gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
@@ -1079,7 +1079,7 @@ index 9f11a25c7ea9..67c119e2400e 100644
for (auto it = saved_back_textures_.begin(); it != saved_back_textures_.end(); for (auto it = saved_back_textures_.begin(); it != saved_back_textures_.end();
++it) { ++it) {
diff --git gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc diff --git gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
index 805d9ae94712..6723682670e4 100644 index 2b5b7f41a055..ae3b016fb2e4 100644
--- gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc --- gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
+++ gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc +++ gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@@ -1090,7 +1090,7 @@ index 805d9ae94712..6723682670e4 100644
#include "gpu/command_buffer/service/command_buffer_service.h" #include "gpu/command_buffer/service/command_buffer_service.h"
#include "gpu/command_buffer/service/decoder_client.h" #include "gpu/command_buffer/service/decoder_client.h"
#include "gpu/command_buffer/service/feature_info.h" #include "gpu/command_buffer/service/feature_info.h"
@@ -2501,6 +2502,67 @@ error::Error GLES2DecoderPassthroughImpl::CheckSwapBuffersResult( @@ -2513,6 +2514,67 @@ error::Error GLES2DecoderPassthroughImpl::CheckSwapBuffersResult(
return error::kNoError; return error::kNoError;
} }

2
patch/patches/ime_1610.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/base/ime/input_method_win_base.cc ui/base/ime/input_method_win_base.cc diff --git ui/base/ime/input_method_win_base.cc ui/base/ime/input_method_win_base.cc
index 6b7c3bef62ae..e731d5037a4e 100644 index bd7edb13c4d1..8917f77e557e 100644
--- ui/base/ime/input_method_win_base.cc --- ui/base/ime/input_method_win_base.cc
+++ ui/base/ime/input_method_win_base.cc +++ ui/base/ime/input_method_win_base.cc
@@ -267,8 +267,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const { @@ -267,8 +267,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const {

4
patch/patches/linux_gtk_2014.patch
View File

@@ -99,7 +99,7 @@ index fd7f3e60a599..9678ad4828cf 100644
"../browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc", "../browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc",
] ]
diff --git remoting/host/BUILD.gn remoting/host/BUILD.gn diff --git remoting/host/BUILD.gn remoting/host/BUILD.gn
index 647f01cfae49..fdbc8f8d49aa 100644 index 7aeefa7b1b89..13fc19218a4c 100644
--- remoting/host/BUILD.gn --- remoting/host/BUILD.gn
+++ remoting/host/BUILD.gn +++ remoting/host/BUILD.gn
@@ -351,7 +351,7 @@ static_library("common") { @@ -351,7 +351,7 @@ static_library("common") {
@@ -111,7 +111,7 @@ index 647f01cfae49..fdbc8f8d49aa 100644
deps += [ "//build/config/linux/gtk" ] deps += [ "//build/config/linux/gtk" ]
} }
} else { } else {
@@ -733,7 +733,7 @@ if (enable_me2me_host) { @@ -734,7 +734,7 @@ if (enable_me2me_host) {
deps += [ "//components/policy:generated" ] deps += [ "//components/policy:generated" ]
} }

42
patch/patches/storage_partition_1973.patch
View File

@@ -171,10 +171,10 @@ index af047913e230..849eeddcfcc5 100644
DCHECK(devtools_context_); DCHECK(devtools_context_);
} }
diff --git content/browser/devtools/protocol/network_handler.cc content/browser/devtools/protocol/network_handler.cc diff --git content/browser/devtools/protocol/network_handler.cc content/browser/devtools/protocol/network_handler.cc
index 4fa2f08b626c..84c3be6138c0 100644 index cfef1021a1ee..8721df15412b 100644
--- content/browser/devtools/protocol/network_handler.cc --- content/browser/devtools/protocol/network_handler.cc
+++ content/browser/devtools/protocol/network_handler.cc +++ content/browser/devtools/protocol/network_handler.cc
@@ -816,8 +816,8 @@ class BackgroundSyncRestorer { @@ -818,8 +818,8 @@ class BackgroundSyncRestorer {
scoped_refptr<ServiceWorkerDevToolsAgentHost> service_worker_host = scoped_refptr<ServiceWorkerDevToolsAgentHost> service_worker_host =
static_cast<ServiceWorkerDevToolsAgentHost*>(host.get()); static_cast<ServiceWorkerDevToolsAgentHost*>(host.get());
scoped_refptr<BackgroundSyncContextImpl> sync_context = scoped_refptr<BackgroundSyncContextImpl> sync_context =
@@ -232,7 +232,7 @@ index ec9ab86d0ca6..0fe5219f1e84 100644
base::WeakPtrFactory<ServiceWorkerHandler> weak_factory_; base::WeakPtrFactory<ServiceWorkerHandler> weak_factory_;
diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc
index 5ed0f15fe47b..5452066f9e73 100644 index dd4924bd5f0c..e7f52e6f51d6 100644
--- content/browser/download/download_manager_impl.cc --- content/browser/download/download_manager_impl.cc
+++ content/browser/download/download_manager_impl.cc +++ content/browser/download/download_manager_impl.cc
@@ -102,9 +102,9 @@ void DeleteDownloadedFileOnUIThread(const base::FilePath& file_path) { @@ -102,9 +102,9 @@ void DeleteDownloadedFileOnUIThread(const base::FilePath& file_path) {
@@ -276,7 +276,7 @@ index 5ed0f15fe47b..5452066f9e73 100644
std::move(proxy_factory_ptr_info), std::move(proxy_factory_request)); std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
} }
@@ -1252,7 +1251,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete( @@ -1258,7 +1257,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
tab_referrer_url = entry->GetReferrer().url; tab_referrer_url = entry->GetReferrer().url;
} }
} }
@@ -285,7 +285,7 @@ index 5ed0f15fe47b..5452066f9e73 100644
GetStoragePartition(browser_context_, render_process_id, render_frame_id); GetStoragePartition(browser_context_, render_process_id, render_frame_id);
in_progress_manager_->InterceptDownloadFromNavigation( in_progress_manager_->InterceptDownloadFromNavigation(
std::move(resource_request), render_process_id, render_frame_id, site_url, std::move(resource_request), render_process_id, render_frame_id, site_url,
@@ -1303,10 +1302,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( @@ -1309,10 +1308,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
base::MakeRefCounted<WebUIDownloadURLLoaderFactoryGetter>( base::MakeRefCounted<WebUIDownloadURLLoaderFactoryGetter>(
rfh, params->url()); rfh, params->url());
} else if (rfh && params->url().SchemeIsFileSystem()) { } else if (rfh && params->url().SchemeIsFileSystem()) {
@@ -298,7 +298,7 @@ index 5ed0f15fe47b..5452066f9e73 100644
std::string storage_domain; std::string storage_domain;
auto* site_instance = rfh->GetSiteInstance(); auto* site_instance = rfh->GetSiteInstance();
if (site_instance) { if (site_instance) {
@@ -1350,10 +1347,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( @@ -1356,10 +1353,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
std::move(wrapper_factory)); std::move(wrapper_factory));
} }
} else { } else {
@@ -402,7 +402,7 @@ index 9d3bee713440..38cc82d730a5 100644
partition->GetPaymentAppContext(); partition->GetPaymentAppContext();
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index 221dc8424f85..840a5533db90 100644 index fda6b51d9bc7..213da23441a9 100644
--- content/browser/renderer_host/render_process_host_impl.cc --- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc
@@ -700,11 +700,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -700,11 +700,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -477,7 +477,7 @@ index 221dc8424f85..840a5533db90 100644
AddObserver(indexed_db_factory_.get()); AddObserver(indexed_db_factory_.get());
AddObserver(service_worker_dispatcher_host_.get()); AddObserver(service_worker_dispatcher_host_.get());
@@ -1868,6 +1870,15 @@ void RenderProcessHostImpl::ResetChannelProxy() { @@ -1861,6 +1863,15 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() { void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -493,7 +493,7 @@ index 221dc8424f85..840a5533db90 100644
MediaInternals* media_internals = MediaInternals::GetInstance(); MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
// from guests. // from guests.
@@ -1907,10 +1918,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1900,10 +1911,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
media_request_context)); media_request_context));
resource_message_filter_ = new ResourceMessageFilter( resource_message_filter_ = new ResourceMessageFilter(
@@ -506,7 +506,7 @@ index 221dc8424f85..840a5533db90 100644
storage_partition_impl_->GetPrefetchURLLoaderService(), storage_partition_impl_->GetPrefetchURLLoaderService(),
browser_context->GetSharedCorsOriginAccessList(), browser_context->GetSharedCorsOriginAccessList(),
std::move(get_contexts_callback), std::move(get_contexts_callback),
@@ -1919,8 +1930,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1912,8 +1923,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(resource_message_filter_.get()); AddFilter(resource_message_filter_.get());
} }
@@ -516,7 +516,7 @@ index 221dc8424f85..840a5533db90 100644
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID()); peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
AddFilter(peer_connection_tracker_host_.get()); AddFilter(peer_connection_tracker_host_.get());
@@ -1937,10 +1947,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -1930,10 +1940,6 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(new TraceMessageFilter(GetID())); AddFilter(new TraceMessageFilter(GetID()));
AddFilter(new ResolveProxyMsgHelper(GetID())); AddFilter(new ResolveProxyMsgHelper(GetID()));
@@ -527,7 +527,7 @@ index 221dc8424f85..840a5533db90 100644
} }
void RenderProcessHostImpl::BindCacheStorage( void RenderProcessHostImpl::BindCacheStorage(
@@ -1952,7 +1958,8 @@ void RenderProcessHostImpl::BindCacheStorage( @@ -1945,7 +1951,8 @@ void RenderProcessHostImpl::BindCacheStorage(
cache_storage_dispatcher_host_ = cache_storage_dispatcher_host_ =
base::MakeRefCounted<CacheStorageDispatcherHost>(); base::MakeRefCounted<CacheStorageDispatcherHost>();
cache_storage_dispatcher_host_->Init( cache_storage_dispatcher_host_->Init(
@@ -537,7 +537,7 @@ index 221dc8424f85..840a5533db90 100644
} }
// Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
// thread entirely. // thread entirely.
@@ -2068,7 +2075,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { @@ -2061,7 +2068,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
base::BindRepeating( base::BindRepeating(
&BackgroundSyncContextImpl::CreateService, &BackgroundSyncContextImpl::CreateService,
base::Unretained( base::Unretained(
@@ -547,7 +547,7 @@ index 221dc8424f85..840a5533db90 100644
AddUIThreadInterface( AddUIThreadInterface(
registry.get(), registry.get(),
base::BindRepeating(&RenderProcessHostImpl::CreateStoragePartitionService, base::BindRepeating(&RenderProcessHostImpl::CreateStoragePartitionService,
@@ -2164,7 +2172,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { @@ -2157,7 +2165,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating( registry->AddInterface(base::BindRepeating(
&CodeCacheHostImpl::Create, GetID(), &CodeCacheHostImpl::Create, GetID(),
@@ -557,7 +557,7 @@ index 221dc8424f85..840a5533db90 100644
base::RetainedRef( base::RetainedRef(
storage_partition_impl_->GetGeneratedCodeCacheContext()))); storage_partition_impl_->GetGeneratedCodeCacheContext())));
@@ -2176,7 +2185,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { @@ -2169,7 +2178,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating( registry->AddInterface(base::BindRepeating(
&ChromeAppCacheService::CreateBackend, &ChromeAppCacheService::CreateBackend,
@@ -567,7 +567,7 @@ index 221dc8424f85..840a5533db90 100644
GetID())); GetID()));
AddUIThreadInterface( AddUIThreadInterface(
@@ -2222,6 +2232,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { @@ -2215,6 +2225,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
plugin_registry_.reset( plugin_registry_.reset(
new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); new PluginRegistryImpl(GetBrowserContext()->GetResourceContext()));
} }
@@ -578,7 +578,7 @@ index 221dc8424f85..840a5533db90 100644
&PluginRegistryImpl::Bind, base::Unretained(plugin_registry_.get()))); &PluginRegistryImpl::Bind, base::Unretained(plugin_registry_.get())));
#endif #endif
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
index a746e1dae051..59e4316ab2ae 100644 index ca57359fee34..44d4a5f56a46 100644
--- content/browser/renderer_host/render_process_host_impl.h --- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h +++ content/browser/renderer_host/render_process_host_impl.h
@@ -101,7 +101,6 @@ class ServiceWorkerDispatcherHost; @@ -101,7 +101,6 @@ class ServiceWorkerDispatcherHost;
@@ -598,7 +598,7 @@ index a746e1dae051..59e4316ab2ae 100644
SiteInstance* site_instance, SiteInstance* site_instance,
bool is_for_guests_only); bool is_for_guests_only);
@@ -518,7 +517,7 @@ class CONTENT_EXPORT RenderProcessHostImpl @@ -523,7 +522,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Use CreateRenderProcessHost() instead of calling this constructor // Use CreateRenderProcessHost() instead of calling this constructor
// directly. // directly.
RenderProcessHostImpl(BrowserContext* browser_context, RenderProcessHostImpl(BrowserContext* browser_context,
@@ -607,7 +607,7 @@ index a746e1dae051..59e4316ab2ae 100644
bool is_for_guests_only); bool is_for_guests_only);
// Initializes a new IPC::ChannelProxy in |channel_|, which will be connected // Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
@@ -787,10 +786,10 @@ class CONTENT_EXPORT RenderProcessHostImpl @@ -792,10 +791,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
// The globally-unique identifier for this RPH. // The globally-unique identifier for this RPH.
const int id_; const int id_;
@@ -621,7 +621,7 @@ index a746e1dae051..59e4316ab2ae 100644
// Keeps track of the BindingIds returned by storage_partition_impl_->Bind() // Keeps track of the BindingIds returned by storage_partition_impl_->Bind()
// calls so we can Unbind() them on cleanup. // calls so we can Unbind() them on cleanup.
diff --git content/browser/renderer_interface_binders.cc content/browser/renderer_interface_binders.cc diff --git content/browser/renderer_interface_binders.cc content/browser/renderer_interface_binders.cc
index 8e4df0b15aeb..02bcdca69af9 100644 index b317a37b4fa1..a0d9e850c5ec 100644
--- content/browser/renderer_interface_binders.cc --- content/browser/renderer_interface_binders.cc
+++ content/browser/renderer_interface_binders.cc +++ content/browser/renderer_interface_binders.cc
@@ -140,7 +140,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() { @@ -140,7 +140,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -813,7 +813,7 @@ index 63fe0125ca1c..698378600723 100644
RenderFrameHost* render_frame_host_; RenderFrameHost* render_frame_host_;
diff --git content/browser/worker_host/dedicated_worker_host.cc content/browser/worker_host/dedicated_worker_host.cc diff --git content/browser/worker_host/dedicated_worker_host.cc content/browser/worker_host/dedicated_worker_host.cc
index d55172625502..22abdeec0c94 100644 index 1897061418d5..3bfd0efff201 100644
--- content/browser/worker_host/dedicated_worker_host.cc --- content/browser/worker_host/dedicated_worker_host.cc
+++ content/browser/worker_host/dedicated_worker_host.cc +++ content/browser/worker_host/dedicated_worker_host.cc
@@ -76,8 +76,7 @@ class DedicatedWorkerHost : public service_manager::mojom::InterfaceProvider { @@ -76,8 +76,7 @@ class DedicatedWorkerHost : public service_manager::mojom::InterfaceProvider {

24
patch/patches/views_1749_2102.patch
View File

@@ -154,7 +154,7 @@ index 46f81be3d27a..249edf8cc5f8 100644
ImageView* image() const { return image_; } ImageView* image() const { return image_; }
Label* label() const; Label* label() const;
diff --git ui/views/controls/label.cc ui/views/controls/label.cc diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index ef1ed1092eb4..e913d9d50741 100644 index 0889f38dcfcb..90339b135ac0 100644
--- ui/views/controls/label.cc --- ui/views/controls/label.cc
+++ ui/views/controls/label.cc +++ ui/views/controls/label.cc
@@ -43,6 +43,22 @@ bool IsOpaque(SkColor color) { @@ -43,6 +43,22 @@ bool IsOpaque(SkColor color) {
@@ -180,7 +180,7 @@ index ef1ed1092eb4..e913d9d50741 100644
const char Label::kViewClassName[] = "Label"; const char Label::kViewClassName[] = "Label";
Label::Label() : Label(base::string16()) { Label::Label() : Label(base::string16()) {
@@ -202,6 +218,14 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) { @@ -205,6 +221,14 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
ResetLayout(); ResetLayout();
} }
@@ -195,7 +195,7 @@ index ef1ed1092eb4..e913d9d50741 100644
void Label::SetTooltipText(const base::string16& tooltip_text) { void Label::SetTooltipText(const base::string16& tooltip_text) {
DCHECK(handles_tooltips_); DCHECK(handles_tooltips_);
tooltip_text_ = tooltip_text; tooltip_text_ = tooltip_text;
@@ -430,7 +454,19 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const { @@ -433,7 +457,19 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
render_text->SetFontList(font_list()); render_text->SetFontList(font_list());
render_text->set_shadows(shadows()); render_text->set_shadows(shadows());
render_text->SetCursorEnabled(false); render_text->SetCursorEnabled(false);
@@ -217,10 +217,10 @@ index ef1ed1092eb4..e913d9d50741 100644
render_text->SetMaxLines(multi_line() ? max_lines() : 0); render_text->SetMaxLines(multi_line() ? max_lines() : 0);
render_text->SetWordWrapBehavior(full_text_->word_wrap_behavior()); render_text->SetWordWrapBehavior(full_text_->word_wrap_behavior());
diff --git ui/views/controls/label.h ui/views/controls/label.h diff --git ui/views/controls/label.h ui/views/controls/label.h
index 771034ccebbe..79e3026f6870 100644 index ae3a1d6636f6..ee6fc25eca90 100644
--- ui/views/controls/label.h --- ui/views/controls/label.h
+++ ui/views/controls/label.h +++ ui/views/controls/label.h
@@ -154,6 +154,10 @@ class VIEWS_EXPORT Label : public View, @@ -159,6 +159,10 @@ class VIEWS_EXPORT Label : public View,
void SetElideBehavior(gfx::ElideBehavior elide_behavior); void SetElideBehavior(gfx::ElideBehavior elide_behavior);
gfx::ElideBehavior elide_behavior() const { return elide_behavior_; } gfx::ElideBehavior elide_behavior() const { return elide_behavior_; }
@@ -231,7 +231,7 @@ index 771034ccebbe..79e3026f6870 100644
// Sets the tooltip text. Default behavior for a label (single-line) is to // Sets the tooltip text. Default behavior for a label (single-line) is to
// show the full text if it is wider than its bounds. Calling this overrides // show the full text if it is wider than its bounds. Calling this overrides
// the default behavior and lets you set a custom tooltip. To revert to // the default behavior and lets you set a custom tooltip. To revert to
@@ -378,6 +382,7 @@ class VIEWS_EXPORT Label : public View, @@ -385,6 +389,7 @@ class VIEWS_EXPORT Label : public View,
bool collapse_when_hidden_; bool collapse_when_hidden_;
int fixed_width_; int fixed_width_;
int max_width_; int max_width_;
@@ -240,10 +240,10 @@ index 771034ccebbe..79e3026f6870 100644
std::unique_ptr<SelectionController> selection_controller_; std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 8a302b528875..8125b5af96c5 100644 index c66b33a62519..ab81a1c632fd 100644
--- ui/views/controls/menu/menu_controller.cc --- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc +++ ui/views/controls/menu/menu_controller.cc
@@ -2618,8 +2618,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( @@ -2623,8 +2623,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() { void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item; MenuItemView* item = pending_state_.item;
@@ -258,7 +258,7 @@ index 8a302b528875..8125b5af96c5 100644
MenuItemView* to_select = NULL; MenuItemView* to_select = NULL;
if (item->GetSubmenu()->GetMenuItemCount() > 0) if (item->GetSubmenu()->GetMenuItemCount() > 0)
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN); to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2638,8 +2643,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { @@ -2643,8 +2648,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() { void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item; MenuItemView* item = state_.item;
DCHECK(item); DCHECK(item);
@@ -310,10 +310,10 @@ index 921aef245bf3..4b7474c01c0e 100644
virtual int GetMaxWidthForMenu(MenuItemView* menu); virtual int GetMaxWidthForMenu(MenuItemView* menu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index e609b8521842..73971df2a441 100644 index 99cbf309d57c..695c5bb92172 100644
--- ui/views/controls/menu/menu_item_view.cc --- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc +++ ui/views/controls/menu/menu_item_view.cc
@@ -1063,6 +1063,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas, @@ -1057,6 +1057,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
spilling_rect.set_y(spilling_rect.y() - corner_radius_); spilling_rect.set_y(spilling_rect.y() - corner_radius_);
spilling_rect.set_height(spilling_rect.height() + corner_radius_); spilling_rect.set_height(spilling_rect.height() + corner_radius_);
canvas->DrawRoundRect(spilling_rect, corner_radius_, flags); canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
@@ -329,7 +329,7 @@ index e609b8521842..73971df2a441 100644
} else if (render_selection) { } else if (render_selection) {
gfx::Rect item_bounds = GetLocalBounds(); gfx::Rect item_bounds = GetLocalBounds();
if (type_ == ACTIONABLE_SUBMENU) { if (type_ == ACTIONABLE_SUBMENU) {
@@ -1129,6 +1138,13 @@ void MenuItemView::PaintMinorIconAndText( @@ -1123,6 +1132,13 @@ void MenuItemView::PaintMinorIconAndText(
} }
SkColor MenuItemView::GetTextColor(bool minor, bool render_selection) const { SkColor MenuItemView::GetTextColor(bool minor, bool render_selection) const {

10
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 9ad76884fa8c..d04f8c633384 100644 index c7ea2789c7d8..51d455abbdd9 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
@@ -2068,21 +2068,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2069,21 +2069,30 @@ 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);
@@ -45,7 +45,7 @@ index 9ad76884fa8c..d04f8c633384 100644
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -2781,6 +2790,15 @@ void WebContentsImpl::CreateNewWindow( @@ -2782,6 +2791,15 @@ void WebContentsImpl::CreateNewWindow(
create_params.renderer_initiated_creation = create_params.renderer_initiated_creation =
main_frame_route_id != MSG_ROUTING_NONE; main_frame_route_id != MSG_ROUTING_NONE;
@@ -61,7 +61,7 @@ index 9ad76884fa8c..d04f8c633384 100644
std::unique_ptr<WebContents> new_contents; std::unique_ptr<WebContents> new_contents;
if (!is_guest) { if (!is_guest) {
create_params.context = view_->GetNativeView(); create_params.context = view_->GetNativeView();
@@ -2813,7 +2831,7 @@ void WebContentsImpl::CreateNewWindow( @@ -2814,7 +2832,7 @@ void WebContentsImpl::CreateNewWindow(
// TODO(brettw): It seems bogus that we have to call this function on the // TODO(brettw): It seems bogus that we have to call this function on the
// newly created object and give it one of its own member variables. // newly created object and give it one of its own member variables.
new_view->CreateViewForWidget( new_view->CreateViewForWidget(
@@ -70,7 +70,7 @@ index 9ad76884fa8c..d04f8c633384 100644
} }
// Save the created window associated with the route so we can show it // Save the created window associated with the route so we can show it
// later. // later.
@@ -6377,7 +6395,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { @@ -6378,7 +6396,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) { RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view = RenderWidgetHostViewBase* rwh_view =

2
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -44,7 +44,7 @@ index eff68a91b185..e2487f1aa0dc 100644
.Top() .Top()
.GetSecurityContext() .GetSecurityContext()
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 c6cc53beb1d4..469869b0ff60 100644 index a7b483e821fe..211b53d0eadb 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
@@ -1359,7 +1359,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { @@ -1359,7 +1359,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {

2
patch/patches/webview_plugin_2020.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index ef5304602534..f2921f6f9da7 100644 index dd03c58a7e44..6ed242b83ef5 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -4589,7 +4589,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4589,7 +4589,7 @@ Keep your key file in a safe place. You will need it to create new versions of y