bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 73.0.3683.0 (#625896)

This commit is contained in:
Marshall Greenblatt 2019-02-01 14:40:18 -05:00
parent 9c50f1bfdb
commit bf51cd21b6
39 changed files with 197 additions and 253 deletions
Show Stats 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/73.0.3679.0' 'chromium_checkout': 'refs/tags/73.0.3683.0'
} }

9
libcef/browser/browser_context.cc
View File

@ -130,6 +130,15 @@ CefBrowserContext::CreateMediaRequestContextForStoragePartition(
return nullptr; return nullptr;
} }
void CefBrowserContext::SetCorsOriginAccessListForOrigin(
const url::Origin& source_origin,
std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
base::OnceClosure closure) {
// This method is called for Extension support.
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, std::move(closure));
}
ChromeZoomLevelPrefs* CefBrowserContext::GetZoomLevelPrefs() { ChromeZoomLevelPrefs* CefBrowserContext::GetZoomLevelPrefs() {
return static_cast<ChromeZoomLevelPrefs*>( return static_cast<ChromeZoomLevelPrefs*>(
GetStoragePartition(this, NULL)->GetZoomLevelDelegate()); GetStoragePartition(this, NULL)->GetZoomLevelDelegate());

5
libcef/browser/browser_context.h
View File

@ -145,6 +145,11 @@ class CefBrowserContext : public ChromeProfileStub {
net::URLRequestContextGetter* CreateMediaRequestContextForStoragePartition( net::URLRequestContextGetter* CreateMediaRequestContextForStoragePartition(
const base::FilePath& partition_path, const base::FilePath& partition_path,
bool in_memory) override; bool in_memory) override;
void SetCorsOriginAccessListForOrigin(
const url::Origin& source_origin,
std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
base::OnceClosure closure) override;
// Profile methods. // Profile methods.
ChromeZoomLevelPrefs* GetZoomLevelPrefs() override; ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;

6
libcef/browser/content_browser_client.cc
View File

@ -658,11 +658,9 @@ CefContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
return base::nullopt; return base::nullopt;
} }
std::vector<content::ContentBrowserClient::ServiceManifestInfo> std::vector<service_manager::Manifest>
CefContentBrowserClient::GetExtraServiceManifests() { CefContentBrowserClient::GetExtraServiceManifests() {
return std::vector<ServiceManifestInfo>({ return std::vector<service_manager::Manifest>{GetCefRendererManifest()};
{chrome::mojom::kRendererServiceName, -1, GetCefRendererManifest()},
});
} }
bool CefContentBrowserClient::IsSameBrowserContext( bool CefContentBrowserClient::IsSameBrowserContext(

2
libcef/browser/content_browser_client.h
View File

@ -56,7 +56,7 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override; void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
base::Optional<service_manager::Manifest> GetServiceManifestOverlay( base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
base::StringPiece name) override; base::StringPiece name) override;
std::vector<ServiceManifestInfo> GetExtraServiceManifests() override; std::vector<service_manager::Manifest> GetExtraServiceManifests() override;
bool IsSameBrowserContext(content::BrowserContext* context1, bool IsSameBrowserContext(content::BrowserContext* context1,
content::BrowserContext* context2) override; content::BrowserContext* context2) override;
void AppendExtraCommandLineSwitches(base::CommandLine* command_line, void AppendExtraCommandLineSwitches(base::CommandLine* command_line,

6
libcef/browser/extensions/component_extension_resource_manager.cc
View File

@ -40,6 +40,12 @@ bool CefComponentExtensionResourceManager::IsComponentExtensionResource(
return entry != path_to_resource_id_.end(); return entry != path_to_resource_id_.end();
} }
const ui::TemplateReplacements*
CefComponentExtensionResourceManager::GetTemplateReplacementsForExtension(
const std::string& extension_id) const {
return nullptr;
}
void CefComponentExtensionResourceManager::AddComponentResourceEntries( void CefComponentExtensionResourceManager::AddComponentResourceEntries(
const GritResourceMap* entries, const GritResourceMap* entries,
size_t size) { size_t size) {

2
libcef/browser/extensions/component_extension_resource_manager.h
View File

@ -24,6 +24,8 @@ class CefComponentExtensionResourceManager
bool IsComponentExtensionResource(const base::FilePath& extension_path, bool IsComponentExtensionResource(const base::FilePath& extension_path,
const base::FilePath& resource_path, const base::FilePath& resource_path,
int* resource_id) const override; int* resource_id) const override;
const ui::TemplateReplacements* GetTemplateReplacementsForExtension(
const std::string& extension_id) const override;
private: private:
void AddComponentResourceEntries(const GritResourceMap* entries, size_t size); void AddComponentResourceEntries(const GritResourceMap* entries, size_t size);

20
libcef/browser/native/javascript_dialog_runner_mac.mm
View File

@ -13,7 +13,7 @@
// Helper object that receives the notification that the dialog/sheet is // Helper object that receives the notification that the dialog/sheet is
// going away. Is responsible for cleaning itself up. // going away. Is responsible for cleaning itself up.
@interface CefJavaScriptDialogHelper : NSObject<NSAlertDelegate> { @interface CefJavaScriptDialogHelper : NSObject <NSAlertDelegate> {
@private @private
base::scoped_nsobject<NSAlert> alert_; base::scoped_nsobject<NSAlert> alert_;
NSTextField* textField_; // WEAK; owned by alert_ NSTextField* textField_; // WEAK; owned by alert_
@ -26,9 +26,8 @@
(CefJavaScriptDialogRunner::DialogClosedCallback)callback; (CefJavaScriptDialogRunner::DialogClosedCallback)callback;
- (NSAlert*)alert; - (NSAlert*)alert;
- (NSTextField*)textField; - (NSTextField*)textField;
- (void)alertDidEnd:(NSAlert*)alert - (void)alertDidEndWithResult:(NSModalResponse)returnCode
returnCode:(int)returnCode dialog:(CefJavaScriptDialogRunnerMac*)dialog;
contextInfo:(void*)contextInfo;
- (void)cancel; - (void)cancel;
@end @end
@ -58,10 +57,9 @@
return textField_; return textField_;
} }
- (void)alertDidEnd:(NSAlert*)alert - (void)alertDidEndWithResult:(NSModalResponse)returnCode
returnCode:(int)returnCode dialog:(CefJavaScriptDialogRunnerMac*)dialog {
contextInfo:(void*)contextInfo { if (returnCode == NSModalResponseStop)
if (returnCode == NSRunStoppedResponse)
return; return;
bool success = returnCode == NSAlertFirstButtonReturn; bool success = returnCode == NSAlertFirstButtonReturn;
@ -143,9 +141,9 @@ void CefJavaScriptDialogRunnerMac::Run(
// discussion. // discussion.
id nilArg = nil; id nilArg = nil;
[alert beginSheetModalForWindow:nilArg // nil here makes it app-modal [alert beginSheetModalForWindow:nilArg // nil here makes it app-modal
modalDelegate:helper_ completionHandler:^void(NSModalResponse returnCode) {
didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) [helper_ alertDidEndWithResult:returnCode dialog:this];
contextInfo:this]; }];
if ([alert accessoryView]) if ([alert accessoryView])
[[alert window] makeFirstResponder:[alert accessoryView]]; [[alert window] makeFirstResponder:[alert accessoryView]];

11
libcef/browser/printing/print_view_manager_base.cc
View File

@ -292,10 +292,13 @@ void CefPrintViewManagerBase::OnNotifyPrintJobEvent(
ShouldQuitFromInnerMessageLoop(); ShouldQuitFromInnerMessageLoop();
break; break;
} }
case JobEventDetails::NEW_DOC:
#if defined(OS_WIN) #if defined(OS_WIN)
case JobEventDetails::PAGE_DONE: case JobEventDetails::PAGE_DONE:
#endif #endif
case JobEventDetails::NEW_DOC: {
// Don't care about the actual printing process.
break;
}
case JobEventDetails::DOC_DONE: { case JobEventDetails::DOC_DONE: {
// Don't care about the actual printing process. // Don't care about the actual printing process.
break; break;
@ -458,11 +461,11 @@ bool CefPrintViewManagerBase::RunInnerMessageLoop() {
// - If we're looping because of renderer page generation, the renderer could // - If we're looping because of renderer page generation, the renderer could
// be CPU bound, the page overly complex/large or the system just // be CPU bound, the page overly complex/large or the system just
// memory-bound. // memory-bound.
static const int kPrinterSettingsTimeout = 60000; static constexpr base::TimeDelta kPrinterSettingsTimeout =
base::TimeDelta::FromSeconds(60);
base::OneShotTimer quit_timer; base::OneShotTimer quit_timer;
base::RunLoop run_loop; base::RunLoop run_loop;
quit_timer.Start(FROM_HERE, quit_timer.Start(FROM_HERE, kPrinterSettingsTimeout,
TimeDelta::FromMilliseconds(kPrinterSettingsTimeout),
run_loop.QuitWhenIdleClosure()); run_loop.QuitWhenIdleClosure());
inside_inner_message_loop_ = true; inside_inner_message_loop_ = true;

26
libcef/browser/printing/printing_message_filter.cc
View File

@ -97,17 +97,6 @@ void CefPrintingMessageFilter::ShutdownOnUIThread() {
printing_shutdown_notifier_.reset(); printing_shutdown_notifier_.reset();
} }
void CefPrintingMessageFilter::OverrideThreadForMessage(
const IPC::Message& message,
BrowserThread::ID* thread) {
#if defined(OS_ANDROID)
if (message.type() == PrintHostMsg_AllocateTempFileForPrinting::ID ||
message.type() == PrintHostMsg_TempFileForPrintingWritten::ID) {
*thread = BrowserThread::UI;
}
#endif
}
void CefPrintingMessageFilter::OnDestruct() const { void CefPrintingMessageFilter::OnDestruct() const {
BrowserThread::DeleteOnUIThread::Destruct(this); BrowserThread::DeleteOnUIThread::Destruct(this);
} }
@ -201,11 +190,6 @@ void CefPrintingMessageFilter::OnScriptedPrintReply(
scoped_refptr<PrinterQuery> printer_query, scoped_refptr<PrinterQuery> printer_query,
IPC::Message* reply_msg) { IPC::Message* reply_msg) {
PrintMsg_PrintPages_Params params; PrintMsg_PrintPages_Params params;
#if defined(OS_ANDROID)
// We need to save the routing ID here because Send method below deletes the
// |reply_msg| before we can get the routing ID for the Android code.
int routing_id = reply_msg->routing_id();
#endif
if (printer_query->last_status() != PrintingContext::OK || if (printer_query->last_status() != PrintingContext::OK ||
!printer_query->settings().dpi()) { !printer_query->settings().dpi()) {
params.Reset(); params.Reset();
@ -217,16 +201,6 @@ void CefPrintingMessageFilter::OnScriptedPrintReply(
PrintHostMsg_ScriptedPrint::WriteReplyParams(reply_msg, params); PrintHostMsg_ScriptedPrint::WriteReplyParams(reply_msg, params);
Send(reply_msg); Send(reply_msg);
if (!params.params.dpi.IsEmpty() && params.params.document_cookie) { if (!params.params.dpi.IsEmpty() && params.params.document_cookie) {
#if defined(OS_ANDROID)
int file_descriptor;
const base::string16& device_name = printer_query->settings().device_name();
if (base::StringToInt(device_name, &file_descriptor)) {
base::PostTaskWithTraits(
FROM_HERE, {BrowserThread::UI},
base::Bind(&CefPrintingMessageFilter::UpdateFileDescriptor, this,
routing_id, file_descriptor));
}
#endif
queue_->QueuePrinterQuery(printer_query.get()); queue_->QueuePrinterQuery(printer_query.get());
} else { } else {
printer_query->StopWorker(); printer_query->StopWorker();

2
libcef/browser/printing/printing_message_filter.h
View File

@ -36,8 +36,6 @@ class CefPrintingMessageFilter : public content::BrowserMessageFilter {
static void EnsureShutdownNotifierFactoryBuilt(); static void EnsureShutdownNotifierFactoryBuilt();
// content::BrowserMessageFilter methods. // content::BrowserMessageFilter methods.
void OverrideThreadForMessage(const IPC::Message& message,
content::BrowserThread::ID* thread) override;
void OnDestruct() const override; void OnDestruct() const override;
bool OnMessageReceived(const IPC::Message& message) override; bool OnMessageReceived(const IPC::Message& message) override;

7
patch/patch.cfg
View File

@ -411,8 +411,9 @@ patches = [
'name': 'message_pump_mac_2495', 'name': 'message_pump_mac_2495',
}, },
{ {
# Windows: Fix DCHECK in PrinterQuery::DetachWorker. # Windows: Fix "error: unknown escape sequence" with jumbo builds.
# https://chromium-review.googlesource.com/c/chromium/src/+/1428087 # https://bugs.chromium.org/p/chromium/issues/detail?id=924454
'name': 'printer_query_924033', 'name': 'v8_embed_924454',
'path': 'v8',
} }
] ]

10
patch/patches/browser_plugin_guest_1565.patch
View File

@ -79,7 +79,7 @@ index 5426d600906c..4bf4537514eb 100644
// Creates a new View that holds a non-top-level widget and receives messages // Creates a new View that holds a non-top-level widget and receives messages
// for it. // for it.
diff --git content/browser/web_contents/web_contents_view_aura.cc content/browser/web_contents/web_contents_view_aura.cc diff --git content/browser/web_contents/web_contents_view_aura.cc content/browser/web_contents/web_contents_view_aura.cc
index 8e02ca39a947..b9ec33465141 100644 index 68fb77a4a2f6..19478931e111 100644
--- content/browser/web_contents/web_contents_view_aura.cc --- content/browser/web_contents/web_contents_view_aura.cc
+++ content/browser/web_contents/web_contents_view_aura.cc +++ content/browser/web_contents/web_contents_view_aura.cc
@@ -867,7 +867,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size, @@ -867,7 +867,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size,
@ -208,7 +208,7 @@ index 1f0e661628aa..f896c842ff0d 100644
RenderWidgetHost* render_widget_host) override; RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override; void SetPageTitle(const base::string16& title) override;
diff --git content/browser/web_contents/web_contents_view_mac.h content/browser/web_contents/web_contents_view_mac.h diff --git content/browser/web_contents/web_contents_view_mac.h content/browser/web_contents/web_contents_view_mac.h
index 18fbea9e4446..cf6b26edfa4d 100644 index c0c553023138..39b8fe0bd57c 100644
--- content/browser/web_contents/web_contents_view_mac.h --- content/browser/web_contents/web_contents_view_mac.h
+++ content/browser/web_contents/web_contents_view_mac.h +++ content/browser/web_contents/web_contents_view_mac.h
@@ -74,7 +74,7 @@ class WebContentsViewMac : public WebContentsView, @@ -74,7 +74,7 @@ class WebContentsViewMac : public WebContentsView,
@ -221,10 +221,10 @@ index 18fbea9e4446..cf6b26edfa4d 100644
RenderWidgetHost* render_widget_host) override; RenderWidgetHost* render_widget_host) override;
void SetPageTitle(const base::string16& title) override; void SetPageTitle(const base::string16& title) override;
diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm
index 699e8709c74d..9f94a4efd45d 100644 index d4f6a36dce63..ba6382ee43ea 100644
--- content/browser/web_contents/web_contents_view_mac.mm --- content/browser/web_contents/web_contents_view_mac.mm
+++ content/browser/web_contents/web_contents_view_mac.mm +++ content/browser/web_contents/web_contents_view_mac.mm
@@ -315,7 +315,8 @@ void WebContentsViewMac::CreateView( @@ -313,7 +313,8 @@ void WebContentsViewMac::CreateView(
} }
RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget( RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
@ -234,7 +234,7 @@ index 699e8709c74d..9f94a4efd45d 100644
if (render_widget_host->GetView()) { if (render_widget_host->GetView()) {
// During testing, the view will already be set up in most cases to the // During testing, the view will already be set up in most cases to the
// test view, so we don't want to clobber it with a real one. To verify that // test view, so we don't want to clobber it with a real one. To verify that
@@ -327,6 +328,7 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget( @@ -325,6 +326,7 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
render_widget_host->GetView()); render_widget_host->GetView());
} }

4
patch/patches/build.patch
View File

@ -1,5 +1,5 @@
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 0e13a4f20aca..89df4a8eaf3e 100644 index 68dc6a001a49..5987483d3127 100644
--- build/config/compiler/BUILD.gn --- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn
@@ -164,7 +164,7 @@ declare_args() { @@ -164,7 +164,7 @@ declare_args() {
@ -11,7 +11,7 @@ index 0e13a4f20aca..89df4a8eaf3e 100644
!(current_cpu == "x86" || current_cpu == "x64")))) !(current_cpu == "x86" || current_cpu == "x64"))))
} }
@@ -1699,8 +1699,6 @@ config("thin_archive") { @@ -1696,8 +1696,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 de1ef8abbca9..52ff84a4994d 100644 index 6ebafc0acd44..96644b7b809c 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 de1ef8abbca9..52ff84a4994d 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")
@@ -1725,6 +1726,7 @@ jumbo_split_static_library("browser") { @@ -1732,6 +1733,7 @@ jumbo_split_static_library("browser") {
"//base:i18n", "//base:i18n",
"//base/allocator:buildflags", "//base/allocator:buildflags",
"//cc", "//cc",
@ -18,7 +18,7 @@ index de1ef8abbca9..52ff84a4994d 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2010,6 +2012,10 @@ jumbo_split_static_library("browser") { @@ -2020,6 +2022,10 @@ jumbo_split_static_library("browser") {
] ]
} }
@ -29,7 +29,7 @@ index de1ef8abbca9..52ff84a4994d 100644
if (is_android) { if (is_android) {
sources += [ sources += [
"after_startup_task_utils_android.cc", "after_startup_task_utils_android.cc",
@@ -3700,7 +3706,7 @@ jumbo_split_static_library("browser") { @@ -3713,7 +3719,7 @@ jumbo_split_static_library("browser") {
] ]
} }

12
patch/patches/chrome_plugins.patch
View File

@ -125,10 +125,10 @@ index 989d5d02cedb..e05810db6824 100644
// If we broke out of the loop, we have found an enabled plugin. // If we broke out of the loop, we have found an enabled plugin.
bool enabled = i < matching_plugins.size(); bool enabled = i < matching_plugins.size();
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 5ed13cdbb5ae..595ceb48e4aa 100644 index 9136ab583964..1839ce97c7e4 100644
--- chrome/renderer/chrome_content_renderer_client.cc --- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc
@@ -782,6 +782,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -781,6 +781,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized || if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) && status == chrome::mojom::PluginStatus::kBlocked) &&
@ -136,7 +136,7 @@ index 5ed13cdbb5ae..595ceb48e4aa 100644
observer->IsPluginTemporarilyAllowed(identifier)) { observer->IsPluginTemporarilyAllowed(identifier)) {
status = chrome::mojom::PluginStatus::kAllowed; status = chrome::mojom::PluginStatus::kAllowed;
} }
@@ -969,7 +970,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -968,7 +969,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface( render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
&plugin_auth_host); &plugin_auth_host);
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier); plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -146,7 +146,7 @@ index 5ed13cdbb5ae..595ceb48e4aa 100644
break; break;
} }
case chrome::mojom::PluginStatus::kBlocked: { case chrome::mojom::PluginStatus::kBlocked: {
@@ -978,7 +980,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -977,7 +979,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name)); l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading(); placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked")); RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -156,7 +156,7 @@ index 5ed13cdbb5ae..595ceb48e4aa 100644
break; break;
} }
case chrome::mojom::PluginStatus::kBlockedByPolicy: { case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -988,7 +991,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -987,7 +990,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name)); group_name));
RenderThread::Get()->RecordAction( RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy")); UserMetricsAction("Plugin_BlockedByPolicy"));
@ -166,7 +166,7 @@ index 5ed13cdbb5ae..595ceb48e4aa 100644
break; break;
} }
case chrome::mojom::PluginStatus::kBlockedNoLoading: { case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -996,7 +1000,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -995,7 +999,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML, IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING, l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name)); group_name));

4
patch/patches/chrome_renderer.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index c84975892678..66e26b943cd1 100644 index 2e32e5797683..89892c369d0b 100644
--- chrome/renderer/BUILD.gn --- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn +++ chrome/renderer/BUILD.gn
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
@ -18,7 +18,7 @@ index c84975892678..66e26b943cd1 100644
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
"//chrome/common", "//chrome/common",
@@ -187,6 +189,10 @@ jumbo_static_library("renderer") { @@ -188,6 +190,10 @@ jumbo_static_library("renderer") {
configs += [ "//build/config/compiler:wexit_time_destructors" ] configs += [ "//build/config/compiler:wexit_time_destructors" ]

10
patch/patches/component_build_1617.patch
View File

@ -34,7 +34,7 @@ index fc252b6ceffd..b0dfd847ec03 100644
MouseWheelPhaseHandler(RenderWidgetHostViewBase* const host_view); MouseWheelPhaseHandler(RenderWidgetHostViewBase* const host_view);
~MouseWheelPhaseHandler() {} ~MouseWheelPhaseHandler() {}
diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
index c9f9a18f1188..ecba73d54a30 100644 index 7668f3725200..665e8e579c54 100644
--- third_party/blink/renderer/controller/BUILD.gn --- third_party/blink/renderer/controller/BUILD.gn
+++ third_party/blink/renderer/controller/BUILD.gn +++ third_party/blink/renderer/controller/BUILD.gn
@@ -25,6 +25,7 @@ component("controller") { @@ -25,6 +25,7 @@ component("controller") {
@ -45,10 +45,10 @@ index c9f9a18f1188..ecba73d54a30 100644
"//third_party/blink/renderer:config", "//third_party/blink/renderer:config",
"//third_party/blink/renderer:inside_blink", "//third_party/blink/renderer:inside_blink",
"//third_party/blink/renderer:non_test_config", "//third_party/blink/renderer:non_test_config",
@@ -43,6 +44,8 @@ component("controller") { @@ -47,6 +48,8 @@ component("controller") {
"controller_export.h", "memory_usage_monitor.h",
"dev_tools_frontend_impl.cc", "memory_usage_monitor_android.cc",
"dev_tools_frontend_impl.h", "memory_usage_monitor_android.h",
+ "//cef/libcef/renderer/blink_glue.cc", + "//cef/libcef/renderer/blink_glue.cc",
+ "//cef/libcef/renderer/blink_glue.h", + "//cef/libcef/renderer/blink_glue.h",
] ]

18
patch/patches/content_2015.patch
View File

@ -51,7 +51,7 @@ index b6da8e846a2a..dd7ec1be2556 100644
return nullptr; return nullptr;
} }
diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc
index 8b08e6168124..7ea95c421b91 100644 index ebf8531af849..fff277b7e62b 100644
--- chrome/browser/ui/views/frame/browser_root_view.cc --- chrome/browser/ui/views/frame/browser_root_view.cc
+++ chrome/browser/ui/views/frame/browser_root_view.cc +++ chrome/browser/ui/views/frame/browser_root_view.cc
@@ -69,7 +69,7 @@ void OnFindURLMimeType(const GURL& url, @@ -69,7 +69,7 @@ void OnFindURLMimeType(const GURL& url,
@ -64,10 +64,10 @@ index 8b08e6168124..7ea95c421b91 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 8593b6ef033e..31d89020a659 100644 index 244992176f0f..a238f052d468 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
@@ -390,12 +390,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() { @@ -391,12 +391,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
} }
RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() { RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() {
@ -81,10 +81,10 @@ index 8593b6ef033e..31d89020a659 100644
"WillFailRequest state should come before WillProcessResponse"); "WillFailRequest state should come before WillProcessResponse");
return render_frame_host_; return 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 1a023385a3d2..52af01625703 100644 index a6c9e15b29af..6fa7cbe3de6b 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
@@ -2140,6 +2140,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( @@ -2153,6 +2153,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
if (GetNavigationHandle()) { if (GetNavigationHandle()) {
GetNavigationHandle()->set_net_error_code( GetNavigationHandle()->set_net_error_code(
static_cast<net::Error>(params.error_code)); static_cast<net::Error>(params.error_code));
@ -92,7 +92,7 @@ index 1a023385a3d2..52af01625703 100644
} }
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
@@ -4808,9 +4809,9 @@ void RenderFrameHostImpl::CommitNavigation( @@ -4834,9 +4835,9 @@ void RenderFrameHostImpl::CommitNavigation(
DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService) || DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService) ||
base::FeatureList::IsEnabled( base::FeatureList::IsEnabled(
blink::features::kServiceWorkerServicification)); blink::features::kServiceWorkerServicification));
@ -340,10 +340,10 @@ index 8136604d267a..be7fde2f1a38 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 a716d1262cdf..9e6fb547f168 100644 index 5b45214bdb34..8d654d142309 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
@@ -3701,7 +3701,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -3689,7 +3689,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(
@ -353,7 +353,7 @@ index a716d1262cdf..9e6fb547f168 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;
@@ -4084,6 +4085,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { @@ -4072,6 +4073,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) {
void RenderFrameImpl::FrameFocused() { void RenderFrameImpl::FrameFocused() {
Send(new FrameHostMsg_FrameFocused(routing_id_)); Send(new FrameHostMsg_FrameFocused(routing_id_));

4
patch/patches/extensions_1947.patch
View File

@ -57,7 +57,7 @@ index 53586512b68f..3a7ba906571a 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 92425b0bded1..3db10cbe9ea0 100644 index 694796bf8dbb..86c9088c1721 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
@@ -452,6 +452,13 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -452,6 +452,13 @@ class CONTENT_EXPORT ContentBrowserClient {
@ -74,7 +74,7 @@ index 92425b0bded1..3db10cbe9ea0 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);
@@ -1471,6 +1478,10 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -1460,6 +1467,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;

16
patch/patches/external_textures_1006.patch
View File

@ -973,7 +973,7 @@ index 740a8dcd3d8c..65c88077908e 100644
GL_APICALL void GL_APIENTRY glInvalidateReadbackBufferShadowDataCHROMIUM (GLidBuffer buffer_id); GL_APICALL void GL_APIENTRY glInvalidateReadbackBufferShadowDataCHROMIUM (GLidBuffer buffer_id);
// (used for CHROMIUM_nonblocking_readback implementation) // (used for CHROMIUM_nonblocking_readback implementation)
diff --git gpu/command_buffer/service/BUILD.gn gpu/command_buffer/service/BUILD.gn diff --git gpu/command_buffer/service/BUILD.gn gpu/command_buffer/service/BUILD.gn
index bd70014dabac..dd2b46994692 100644 index c0fd9edb8ad3..6df357123182 100644
--- gpu/command_buffer/service/BUILD.gn --- gpu/command_buffer/service/BUILD.gn
+++ gpu/command_buffer/service/BUILD.gn +++ gpu/command_buffer/service/BUILD.gn
@@ -106,6 +106,8 @@ target(link_target_type, "gles2_sources") { @@ -106,6 +106,8 @@ target(link_target_type, "gles2_sources") {
@ -986,7 +986,7 @@ index bd70014dabac..dd2b46994692 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 97b7598ccc4f..fb3c20384c9c 100644 index a3caf17ca6af..64ee2559e638 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
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
@ -1020,7 +1020,7 @@ index 97b7598ccc4f..fb3c20384c9c 100644
base::flat_set<scoped_refptr<Buffer>> writes_submitted_but_not_completed_; base::flat_set<scoped_refptr<Buffer>> writes_submitted_but_not_completed_;
// The format of the back buffer_ // The format of the back buffer_
@@ -5522,6 +5532,59 @@ error::Error GLES2DecoderImpl::HandleDestroyGpuFenceCHROMIUM( @@ -5524,6 +5534,59 @@ error::Error GLES2DecoderImpl::HandleDestroyGpuFenceCHROMIUM(
return error::kNoError; return error::kNoError;
} }
@ -1191,10 +1191,10 @@ index ed682013976b..4bc28fe68a5d 100644
size_t active_texture_unit_; size_t active_texture_unit_;
diff --git ui/compositor/compositor.cc ui/compositor/compositor.cc diff --git ui/compositor/compositor.cc ui/compositor/compositor.cc
index 5d3c2bf5cd8e..c6b20fa563ce 100644 index 74e8d5b78d53..c169a5672ac1 100644
--- ui/compositor/compositor.cc --- ui/compositor/compositor.cc
+++ ui/compositor/compositor.cc +++ ui/compositor/compositor.cc
@@ -502,6 +502,16 @@ scoped_refptr<CompositorVSyncManager> Compositor::vsync_manager() const { @@ -516,6 +516,16 @@ scoped_refptr<CompositorVSyncManager> Compositor::vsync_manager() const {
return vsync_manager_; return vsync_manager_;
} }
@ -1212,7 +1212,7 @@ index 5d3c2bf5cd8e..c6b20fa563ce 100644
observer_list_.AddObserver(observer); observer_list_.AddObserver(observer);
} }
diff --git ui/compositor/compositor.h ui/compositor/compositor.h diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index a445b569ede1..0d7cface5026 100644 index 313431f82ee7..e71fb0739ffc 100644
--- ui/compositor/compositor.h --- ui/compositor/compositor.h
+++ ui/compositor/compositor.h +++ ui/compositor/compositor.h
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
@ -1271,7 +1271,7 @@ index a445b569ede1..0d7cface5026 100644
// Compositor does not own observers. It is the responsibility of the // Compositor does not own observers. It is the responsibility of the
// observer to remove itself when it is done observing. // observer to remove itself when it is done observing.
void AddObserver(CompositorObserver* observer); void AddObserver(CompositorObserver* observer);
@@ -440,6 +461,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, @@ -442,6 +463,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
ui::ContextFactory* context_factory_; ui::ContextFactory* context_factory_;
ui::ContextFactoryPrivate* context_factory_private_; ui::ContextFactoryPrivate* context_factory_private_;
@ -1280,7 +1280,7 @@ index a445b569ede1..0d7cface5026 100644
// The root of the Layer tree drawn by this compositor. // The root of the Layer tree drawn by this compositor.
Layer* root_layer_ = nullptr; Layer* root_layer_ = nullptr;
@@ -474,6 +497,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, @@ -476,6 +499,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
ExternalBeginFrameClient* const external_begin_frame_client_; ExternalBeginFrameClient* const external_begin_frame_client_;

6
patch/patches/gn_config.patch
View File

@ -1,8 +1,8 @@
diff --git .gn .gn diff --git .gn .gn
index a0cba4a846c1..1196ae6ef30a 100644 index a8956fd54ce7..b7254af29760 100644
--- .gn --- .gn
+++ .gn +++ .gn
@@ -674,6 +674,8 @@ exec_script_whitelist = @@ -672,6 +672,8 @@ exec_script_whitelist =
# in the Chromium repo outside of //build. # in the Chromium repo outside of //build.
"//build_overrides/build.gni", "//build_overrides/build.gni",
@ -12,7 +12,7 @@ index a0cba4a846c1..1196ae6ef30a 100644
# https://crbug.com/474506. # https://crbug.com/474506.
"//clank/java/BUILD.gn", "//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn diff --git BUILD.gn BUILD.gn
index ea376e895eb1..78569ded3e5e 100644 index 7ac0e16e1e14..40e3b2a3e305 100644
--- BUILD.gn --- BUILD.gn
+++ BUILD.gn +++ BUILD.gn
@@ -184,6 +184,7 @@ group("gn_all") { @@ -184,6 +184,7 @@ group("gn_all") {

8
patch/patches/linux_gtk_2014.patch
View File

@ -68,10 +68,10 @@ index d44c7feaabec..5f1992335a38 100644
void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
index c1f62965b8ac..4ff9852be625 100644 index 8654e43cf38d..4176a60bbab3 100644
--- chrome/test/BUILD.gn --- chrome/test/BUILD.gn
+++ chrome/test/BUILD.gn +++ chrome/test/BUILD.gn
@@ -3954,7 +3954,7 @@ test("unit_tests") { @@ -3962,7 +3962,7 @@ test("unit_tests") {
"../browser/ui/input_method/input_method_engine_unittest.cc", "../browser/ui/input_method/input_method_engine_unittest.cc",
] ]
} }
@ -80,7 +80,7 @@ index c1f62965b8ac..4ff9852be625 100644
sources += sources +=
[ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ] [ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
deps += [ "//build/config/linux/gtk" ] deps += [ "//build/config/linux/gtk" ]
@@ -3975,7 +3975,7 @@ test("unit_tests") { @@ -3983,7 +3983,7 @@ test("unit_tests") {
if (use_gio) { if (use_gio) {
configs += [ "//build/linux:gio_config" ] configs += [ "//build/linux:gio_config" ]
} }
@ -89,7 +89,7 @@ index c1f62965b8ac..4ff9852be625 100644
deps += [ "//chrome/browser/ui/libgtkui" ] deps += [ "//chrome/browser/ui/libgtkui" ]
} }
@@ -4975,7 +4975,7 @@ if (!is_android) { @@ -4985,7 +4985,7 @@ if (!is_android) {
# suites, it seems like one or another starts timing out too. # suites, it seems like one or another starts timing out too.
"../browser/ui/views/keyboard_access_browsertest.cc", "../browser/ui/views/keyboard_access_browsertest.cc",
] ]

12
patch/patches/message_loop.patch
View File

@ -108,10 +108,10 @@ index 56c147d1e739..4afd37ba5b10 100644
#if !defined(OS_NACL) #if !defined(OS_NACL)
diff --git base/message_loop/message_loop_impl.h base/message_loop/message_loop_impl.h diff --git base/message_loop/message_loop_impl.h base/message_loop/message_loop_impl.h
index cefa94ff52d6..13acc90d10dc 100644 index bfcdf0c9694b..d0009f6a88d0 100644
--- base/message_loop/message_loop_impl.h --- base/message_loop/message_loop_impl.h
+++ base/message_loop/message_loop_impl.h +++ base/message_loop/message_loop_impl.h
@@ -77,6 +77,8 @@ class BASE_EXPORT MessageLoopImpl : public MessageLoopBase, @@ -78,6 +78,8 @@ class BASE_EXPORT MessageLoopImpl : public MessageLoopBase,
void DeletePendingTasks() override; void DeletePendingTasks() override;
bool HasTasks() override; bool HasTasks() override;
@ -121,7 +121,7 @@ index cefa94ff52d6..13acc90d10dc 100644
const scoped_refptr<SingleThreadTaskRunner>& task_runner() const { const scoped_refptr<SingleThreadTaskRunner>& task_runner() const {
return task_runner_; return task_runner_;
diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
index 1d6748e0e88a..1598fb65484e 100644 index 5d917056f2e2..4aee732f1b71 100644
--- base/message_loop/message_pump_win.cc --- base/message_loop/message_pump_win.cc
+++ base/message_loop/message_pump_win.cc +++ base/message_loop/message_pump_win.cc
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@ -132,7 +132,7 @@ index 1d6748e0e88a..1598fb65484e 100644
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
@@ -384,20 +385,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) { @@ -385,20 +386,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
} }
bool MessagePumpForUI::ProcessPumpReplacementMessage() { bool MessagePumpForUI::ProcessPumpReplacementMessage() {
@ -174,10 +174,10 @@ index 1d6748e0e88a..1598fb65484e 100644
msg.hwnd != message_window_.hwnd()); msg.hwnd != message_window_.hwnd());
diff --git base/task/sequence_manager/sequence_manager_impl.h base/task/sequence_manager/sequence_manager_impl.h diff --git base/task/sequence_manager/sequence_manager_impl.h base/task/sequence_manager/sequence_manager_impl.h
index 8dafb175bb5e..291cdc9c1cd3 100644 index e3838c1b33bd..ded869d57924 100644
--- base/task/sequence_manager/sequence_manager_impl.h --- base/task/sequence_manager/sequence_manager_impl.h
+++ base/task/sequence_manager/sequence_manager_impl.h +++ base/task/sequence_manager/sequence_manager_impl.h
@@ -164,6 +164,8 @@ class BASE_EXPORT SequenceManagerImpl @@ -165,6 +165,8 @@ class BASE_EXPORT SequenceManagerImpl
void BindToCurrentThread(std::unique_ptr<MessagePump> pump) override; void BindToCurrentThread(std::unique_ptr<MessagePump> pump) override;
void DeletePendingTasks() override; void DeletePendingTasks() override;
bool HasTasks() override; bool HasTasks() override;

4
patch/patches/net_filter_515.patch
View File

@ -22,10 +22,10 @@ index 49fe875c7d22..c1e3df840dc0 100644
THREAD_CHECKER(thread_checker_); THREAD_CHECKER(thread_checker_);
diff --git net/url_request/url_request_job.cc net/url_request/url_request_job.cc diff --git net/url_request/url_request_job.cc net/url_request/url_request_job.cc
index efcd4d5a5d4a..56f2ac5e3f7d 100644 index dc7c3d2fd023..e2b348746816 100644
--- net/url_request/url_request_job.cc --- net/url_request/url_request_job.cc
+++ net/url_request/url_request_job.cc +++ net/url_request/url_request_job.cc
@@ -464,6 +464,12 @@ void URLRequestJob::NotifyHeadersComplete() { @@ -467,6 +467,12 @@ void URLRequestJob::NotifyHeadersComplete() {
DCHECK(!source_stream_); DCHECK(!source_stream_);
source_stream_ = SetUpSourceStream(); source_stream_ = SetUpSourceStream();

16
patch/patches/prefs_content_1161.patch
View File

@ -1,8 +1,8 @@
diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h
index 848a7399cc3c..f622508f83d2 100644 index 242b0628f54e..0538943b4f20 100644
--- content/public/common/common_param_traits_macros.h --- content/public/common/common_param_traits_macros.h
+++ content/public/common/common_param_traits_macros.h +++ content/public/common/common_param_traits_macros.h
@@ -188,6 +188,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) @@ -189,6 +189,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes) IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale) IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled) IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
@ -11,10 +11,10 @@ index 848a7399cc3c..f622508f83d2 100644
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop) IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled) IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc
index 9b2926f7495c..88c854a84c22 100644 index 8ce9ab728194..22305856b974 100644
--- content/public/common/web_preferences.cc --- content/public/common/web_preferences.cc
+++ content/public/common/web_preferences.cc +++ content/public/common/web_preferences.cc
@@ -167,6 +167,7 @@ WebPreferences::WebPreferences() @@ -168,6 +168,7 @@ WebPreferences::WebPreferences()
spatial_navigation_enabled(false), spatial_navigation_enabled(false),
use_solid_color_scrollbars(false), use_solid_color_scrollbars(false),
navigate_on_drag_drop(true), navigate_on_drag_drop(true),
@ -23,10 +23,10 @@ index 9b2926f7495c..88c854a84c22 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 1e9d3ec160ac..cbff1daf09a8 100644 index 32cc528cd938..91bc866edddb 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
@@ -191,6 +191,7 @@ struct CONTENT_EXPORT WebPreferences { @@ -192,6 +192,7 @@ struct CONTENT_EXPORT WebPreferences {
bool spatial_navigation_enabled; bool spatial_navigation_enabled;
bool use_solid_color_scrollbars; bool use_solid_color_scrollbars;
bool navigate_on_drag_drop; bool navigate_on_drag_drop;
@ -35,10 +35,10 @@ index 1e9d3ec160ac..cbff1daf09a8 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 ad23a9040c21..7c98d0877863 100644 index 77b93bd04c8b..512bf7ab5922 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
@@ -1008,6 +1008,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, @@ -1013,6 +1013,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
#endif #endif
WebRuntimeFeatures::EnableTranslateService(prefs.translate_service_available); WebRuntimeFeatures::EnableTranslateService(prefs.translate_service_available);

28
patch/patches/print_header_footer_1478_1565.patch
View File

@ -1,5 +1,5 @@
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 3c627ccaf41c..760b38dbf140 100644 index 46bee4c2a411..182b9b7ccc32 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -362,6 +362,7 @@ jumbo_split_static_library("ui") { @@ -362,6 +362,7 @@ jumbo_split_static_library("ui") {
@ -10,7 +10,7 @@ index 3c627ccaf41c..760b38dbf140 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2307,7 +2308,7 @@ jumbo_split_static_library("ui") { @@ -2311,7 +2312,7 @@ jumbo_split_static_library("ui") {
"views/frame/native_browser_frame_factory_ozone.cc", "views/frame/native_browser_frame_factory_ozone.cc",
] ]
} else { } else {
@ -142,7 +142,7 @@ index 528773d80a2f..3355de3884cd 100644
} }
-#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
diff --git components/printing/common/print_messages.h components/printing/common/print_messages.h diff --git components/printing/common/print_messages.h components/printing/common/print_messages.h
index 7dd892feb181..0124465afc5f 100644 index 1802034a6e15..ae0d479ecafa 100644
--- components/printing/common/print_messages.h --- components/printing/common/print_messages.h
+++ components/printing/common/print_messages.h +++ components/printing/common/print_messages.h
@@ -85,7 +85,6 @@ struct PrintMsg_PrintFrame_Params { @@ -85,7 +85,6 @@ struct PrintMsg_PrintFrame_Params {
@ -231,15 +231,15 @@ index 7dd892feb181..0124465afc5f 100644
// Messages sent from the renderer to the browser. // Messages sent from the renderer to the browser.
@@ -456,7 +446,6 @@ IPC_MESSAGE_CONTROL3(PrintHostMsg_TempFileForPrintingWritten, @@ -443,7 +433,6 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PrintHostMsg_ScriptedPrint,
int /* page count */) PrintMsg_PrintPages_Params
#endif // defined(OS_ANDROID) /* settings chosen by the user*/)
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW) -#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Asks the browser to do print preview. // Asks the browser to do print preview.
IPC_MESSAGE_ROUTED1(PrintHostMsg_RequestPrintPreview, IPC_MESSAGE_ROUTED1(PrintHostMsg_RequestPrintPreview,
PrintHostMsg_RequestPrintPreview_Params /* params */) PrintHostMsg_RequestPrintPreview_Params /* params */)
@@ -493,7 +482,6 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PrintHostMsg_CheckForCancel, @@ -480,7 +469,6 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PrintHostMsg_CheckForCancel,
IPC_MESSAGE_ROUTED2(PrintHostMsg_MetafileReadyForPrinting, IPC_MESSAGE_ROUTED2(PrintHostMsg_MetafileReadyForPrinting,
PrintHostMsg_DidPreviewDocument_Params /* params */, PrintHostMsg_DidPreviewDocument_Params /* params */,
PrintHostMsg_PreviewIds /* ids */) PrintHostMsg_PreviewIds /* ids */)
@ -247,7 +247,7 @@ index 7dd892feb181..0124465afc5f 100644
// This is sent when there are invalid printer settings. // This is sent when there are invalid printer settings.
IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError) IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError)
@@ -502,7 +490,6 @@ IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError) @@ -489,7 +477,6 @@ IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError)
IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintingFailed, IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintingFailed,
int /* document cookie */) int /* document cookie */)
@ -255,7 +255,7 @@ index 7dd892feb181..0124465afc5f 100644
// Tell the browser print preview failed. // Tell the browser print preview failed.
IPC_MESSAGE_ROUTED2(PrintHostMsg_PrintPreviewFailed, IPC_MESSAGE_ROUTED2(PrintHostMsg_PrintPreviewFailed,
int /* document cookie */, int /* document cookie */,
@@ -533,6 +520,5 @@ IPC_MESSAGE_ROUTED1(PrintHostMsg_ShowScriptedPrintPreview, @@ -520,6 +507,5 @@ IPC_MESSAGE_ROUTED1(PrintHostMsg_ShowScriptedPrintPreview,
IPC_MESSAGE_ROUTED2(PrintHostMsg_SetOptionsFromDocument, IPC_MESSAGE_ROUTED2(PrintHostMsg_SetOptionsFromDocument,
PrintHostMsg_SetOptionsFromDocument_Params /* params */, PrintHostMsg_SetOptionsFromDocument_Params /* params */,
PrintHostMsg_PreviewIds /* ids */) PrintHostMsg_PreviewIds /* ids */)
@ -263,7 +263,7 @@ index 7dd892feb181..0124465afc5f 100644
#endif // COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_ #endif // COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_
diff --git components/printing/renderer/print_render_frame_helper.cc components/printing/renderer/print_render_frame_helper.cc diff --git components/printing/renderer/print_render_frame_helper.cc components/printing/renderer/print_render_frame_helper.cc
index 0af11fbfa50e..efb4632489fe 100644 index cd9306860bba..3b7b505aff73 100644
--- components/printing/renderer/print_render_frame_helper.cc --- components/printing/renderer/print_render_frame_helper.cc
+++ components/printing/renderer/print_render_frame_helper.cc +++ components/printing/renderer/print_render_frame_helper.cc
@@ -351,7 +351,6 @@ bool IsPrintingFrameset(const blink::WebLocalFrame* frame) { @@ -351,7 +351,6 @@ bool IsPrintingFrameset(const blink::WebLocalFrame* frame) {
@ -408,7 +408,7 @@ index 0af11fbfa50e..efb4632489fe 100644
} }
prep_frame_view_.reset(); prep_frame_view_.reset();
print_pages_params_.reset(); print_pages_params_.reset();
@@ -1910,7 +1894,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame, @@ -1908,7 +1892,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
return true; return true;
} }
@ -416,7 +416,7 @@ index 0af11fbfa50e..efb4632489fe 100644
bool PrintRenderFrameHelper::SetOptionsFromPdfDocument( bool PrintRenderFrameHelper::SetOptionsFromPdfDocument(
PrintHostMsg_SetOptionsFromDocument_Params* options) { PrintHostMsg_SetOptionsFromDocument_Params* options) {
blink::WebLocalFrame* source_frame = print_preview_context_.source_frame(); blink::WebLocalFrame* source_frame = print_preview_context_.source_frame();
@@ -2003,7 +1986,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings( @@ -2001,7 +1984,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings(
print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS); print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS);
return false; return false;
} }
@ -424,7 +424,7 @@ index 0af11fbfa50e..efb4632489fe 100644
void PrintRenderFrameHelper::GetPrintSettingsFromUser( void PrintRenderFrameHelper::GetPrintSettingsFromUser(
blink::WebLocalFrame* frame, blink::WebLocalFrame* frame,
@@ -2155,7 +2137,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem( @@ -2153,7 +2135,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
return true; return true;
} }
@ -432,7 +432,7 @@ index 0af11fbfa50e..efb4632489fe 100644
void PrintRenderFrameHelper::ShowScriptedPrintPreview() { void PrintRenderFrameHelper::ShowScriptedPrintPreview() {
if (is_scripted_preview_delayed_) { if (is_scripted_preview_delayed_) {
is_scripted_preview_delayed_ = false; is_scripted_preview_delayed_ = false;
@@ -2281,7 +2262,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered( @@ -2279,7 +2260,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params, ids)); Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params, ids));
return true; return true;
} }

75
patch/patches/printer_query_924033.patch
View File

@ -1,75 +0,0 @@
diff --git chrome/browser/printing/printer_query.cc chrome/browser/printing/printer_query.cc
index 5786a450fdb6..2abaa6e3168e 100644
--- chrome/browser/printing/printer_query.cc
+++ chrome/browser/printing/printer_query.cc
@@ -12,6 +12,7 @@
#include "base/location.h"
#include "base/task/post_task.h"
#include "base/threading/thread_restrictions.h"
+#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
#include "chrome/browser/printing/print_job_worker.h"
#include "content/public/browser/browser_task_traits.h"
@@ -22,7 +23,9 @@
namespace printing {
PrinterQuery::PrinterQuery(int render_process_id, int render_frame_id)
- : cookie_(PrintSettings::NewCookie()),
+ : base::RefCountedDeleteOnSequence<PrinterQuery>(
+ base::ThreadTaskRunnerHandle::Get()),
+ cookie_(PrintSettings::NewCookie()),
worker_(std::make_unique<PrintJobWorker>(render_process_id,
render_frame_id,
this)) {
@@ -57,7 +60,7 @@ void PrinterQuery::GetSettingsDone(const PrintSettings& new_settings,
}
std::unique_ptr<PrintJobWorker> PrinterQuery::DetachWorker() {
- DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(!callback_);
DCHECK(worker_);
diff --git chrome/browser/printing/printer_query.h chrome/browser/printing/printer_query.h
index 6d9b0e74196f..b6d8e2220d02 100644
--- chrome/browser/printing/printer_query.h
+++ chrome/browser/printing/printer_query.h
@@ -9,7 +9,7 @@
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/ref_counted.h"
+#include "base/memory/ref_counted_delete_on_sequence.h"
#include "base/values.h"
#include "printing/print_job_constants.h"
#include "printing/print_settings.h"
@@ -24,7 +24,7 @@ namespace printing {
class PrintJobWorker;
// Query the printer for settings.
-class PrinterQuery : public base::RefCountedThreadSafe<PrinterQuery> {
+class PrinterQuery : public base::RefCountedDeleteOnSequence<PrinterQuery> {
public:
// GetSettings() UI parameter.
enum class GetSettingsAskParam {
@@ -41,6 +41,8 @@ class PrinterQuery : public base::RefCountedThreadSafe<PrinterQuery> {
// Detach the PrintJobWorker associated to this object. Virtual so that tests
// can override.
+ // Called on the UI thread.
+ // TODO(thestig): Do |worker_| and |callback_| need locks?
virtual std::unique_ptr<PrintJobWorker> DetachWorker();
// Virtual so that tests can override.
@@ -84,8 +86,9 @@ class PrinterQuery : public base::RefCountedThreadSafe<PrinterQuery> {
bool PostTask(const base::Location& from_here, base::OnceClosure task);
protected:
- // Refcounted class.
- friend class base::RefCountedThreadSafe<PrinterQuery>;
+ // RefCountedDeleteOnSequence class.
+ friend class base::RefCountedDeleteOnSequence<PrinterQuery>;
+ friend class base::DeleteHelper<PrinterQuery>;
virtual ~PrinterQuery();

4
patch/patches/rwh_background_color_1984.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index 5df169e8bcd9..0bd8180493e9 100644 index cffe3954f036..a1fa27523f93 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc --- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -731,10 +731,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const { @@ -731,10 +731,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const {
@ -19,7 +19,7 @@ index 5df169e8bcd9..0bd8180493e9 100644
} }
void RenderWidgetHostViewAura::WindowTitleChanged() { void RenderWidgetHostViewAura::WindowTitleChanged() {
@@ -2027,6 +2029,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { @@ -2024,6 +2026,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
if (frame_sink_id_.is_valid()) if (frame_sink_id_.is_valid())
window_->SetEmbedFrameSinkId(frame_sink_id_); window_->SetEmbedFrameSinkId(frame_sink_id_);

36
patch/patches/storage_partition_1973.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/appcache/appcache_internals_ui.cc content/browser/appcache/appcache_internals_ui.cc diff --git content/browser/appcache/appcache_internals_ui.cc content/browser/appcache/appcache_internals_ui.cc
index 6e0a207374fa..ea7bfcdbc378 100644 index f03f5472f99d..004aeb3d9b69 100644
--- content/browser/appcache/appcache_internals_ui.cc --- content/browser/appcache/appcache_internals_ui.cc
+++ content/browser/appcache/appcache_internals_ui.cc +++ content/browser/appcache/appcache_internals_ui.cc
@@ -383,8 +383,8 @@ void AppCacheInternalsUI::CreateProxyForPartition( @@ -384,8 +384,8 @@ void AppCacheInternalsUI::CreateProxyForPartition(
StoragePartition* storage_partition) { StoragePartition* storage_partition) {
scoped_refptr<Proxy> proxy = scoped_refptr<Proxy> proxy =
new Proxy(weak_ptr_factory_.GetWeakPtr(), storage_partition->GetPath()); new Proxy(weak_ptr_factory_.GetWeakPtr(), storage_partition->GetPath());
@ -83,10 +83,10 @@ index 4728c4f008b5..07dc19b2240a 100644
partition->GetBluetoothAllowedDevicesMap(); partition->GetBluetoothAllowedDevicesMap();
return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin()); return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
diff --git content/browser/browser_context.cc content/browser/browser_context.cc diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index 617683c9e47e..9ad01edc2ea7 100644 index 0c58a53ac435..aa462081c726 100644
--- content/browser/browser_context.cc --- content/browser/browser_context.cc
+++ content/browser/browser_context.cc +++ content/browser/browser_context.cc
@@ -257,11 +257,18 @@ StoragePartition* GetStoragePartitionFromConfig( @@ -209,11 +209,18 @@ StoragePartition* GetStoragePartitionFromConfig(
StoragePartitionImplMap* partition_map = StoragePartitionImplMap* partition_map =
GetStoragePartitionMap(browser_context); GetStoragePartitionMap(browser_context);
@ -108,9 +108,9 @@ index 617683c9e47e..9ad01edc2ea7 100644
} }
void SaveSessionStateOnIOThread( void SaveSessionStateOnIOThread(
@@ -821,6 +828,11 @@ BrowserContext::BrowserContext() @@ -731,6 +738,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
new SharedCorsOriginAccessListImpl())); BrowserContext::BrowserContext()
} : unique_id_(base::UnguessableToken::Create().ToString()) {}
+// static +// static
+const void* BrowserContext::GetStoragePartitionMapUserDataKey() { +const void* BrowserContext::GetStoragePartitionMapUserDataKey() {
@ -121,7 +121,7 @@ index 617683c9e47e..9ad01edc2ea7 100644
CHECK(GetUserData(kServiceInstanceGroup)) CHECK(GetUserData(kServiceInstanceGroup))
<< "Attempting to destroy a BrowserContext that never called " << "Attempting to destroy a BrowserContext that never called "
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 d82370f5d7ff..a586244eaef0 100644 index 6ff1be0aed25..140a59ba3ac0 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
@@ -804,8 +804,7 @@ class BackgroundSyncRestorer { @@ -804,8 +804,7 @@ class BackgroundSyncRestorer {
@ -171,7 +171,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 163932d9f686..8a2ecaa1c157 100644 index 941eb49f0283..c693adf52068 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
@@ -99,9 +99,9 @@ void DeleteDownloadedFileOnUIThread(const base::FilePath& file_path) { @@ -99,9 +99,9 @@ void DeleteDownloadedFileOnUIThread(const base::FilePath& file_path) {
@ -251,7 +251,7 @@ index 163932d9f686..8a2ecaa1c157 100644
CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true); CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true);
} }
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index e399585bcab0..ba922d93d58e 100644 index eb08165b2708..149abb4b4e79 100644
--- content/browser/loader/navigation_url_loader_impl.cc --- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc
@@ -387,7 +387,7 @@ class AboutURLLoaderFactory : public network::mojom::URLLoaderFactory { @@ -387,7 +387,7 @@ class AboutURLLoaderFactory : public network::mojom::URLLoaderFactory {
@ -263,7 +263,7 @@ index e399585bcab0..ba922d93d58e 100644
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
network::mojom::URLLoaderFactoryPtrInfo factory_info; network::mojom::URLLoaderFactoryPtrInfo factory_info;
network::mojom::URLLoaderFactoryParamsPtr params = network::mojom::URLLoaderFactoryParamsPtr params =
@@ -1257,7 +1257,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController @@ -1259,7 +1259,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
// path does as well for navigations. // path does as well for navigations.
bool has_plugin = PluginService::GetInstance()->GetPluginInfo( bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
-1 /* render_process_id */, -1 /* render_frame_id */, resource_context_, -1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
@ -272,7 +272,7 @@ index e399585bcab0..ba922d93d58e 100644
false /* allow_wildcard */, &stale, &plugin, nullptr); false /* allow_wildcard */, &stale, &plugin, nullptr);
if (stale) { if (stale) {
@@ -1607,7 +1607,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( @@ -1608,7 +1608,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl(
CreateResourceRequest(request_info.get(), frame_tree_node_id, CreateResourceRequest(request_info.get(), frame_tree_node_id,
IsNavigationDownloadAllowed(download_policy_)); IsNavigationDownloadAllowed(download_policy_));
@ -328,7 +328,7 @@ index d821dc59609c..58ff1bc59fed 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 e27ad6494834..ee5d5c309d45 100644 index 2841e44002e7..de25b4bb3067 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
@@ -747,11 +747,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -747,11 +747,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@ -428,7 +428,7 @@ index e27ad6494834..ee5d5c309d45 100644
- storage_partition_impl_->GetServiceWorkerContext(), - storage_partition_impl_->GetServiceWorkerContext(),
+ service_worker_context, + service_worker_context,
storage_partition_impl_->GetPrefetchURLLoaderService(), storage_partition_impl_->GetPrefetchURLLoaderService(),
BrowserContext::GetSharedCorsOriginAccessList(browser_context), browser_context->GetSharedCorsOriginAccessList(),
std::move(get_contexts_callback), std::move(get_contexts_callback),
@@ -2027,8 +2038,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { @@ -2027,8 +2038,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(resource_message_filter_.get()); AddFilter(resource_message_filter_.get());
@ -741,7 +741,7 @@ index 9ec4836022bb..57a6480bfd95 100644
std::move(client), creation_context_type, std::move(client), creation_context_type,
blink::MessagePortChannel(std::move(message_port)), blink::MessagePortChannel(std::move(message_port)),
diff --git content/browser/worker_host/worker_script_fetch_initiator.cc content/browser/worker_host/worker_script_fetch_initiator.cc diff --git content/browser/worker_host/worker_script_fetch_initiator.cc content/browser/worker_host/worker_script_fetch_initiator.cc
index 482499bdbb5e..c95d3c61847f 100644 index 1b69f17bd2e3..186f36148565 100644
--- content/browser/worker_host/worker_script_fetch_initiator.cc --- content/browser/worker_host/worker_script_fetch_initiator.cc
+++ content/browser/worker_host/worker_script_fetch_initiator.cc +++ content/browser/worker_host/worker_script_fetch_initiator.cc
@@ -98,7 +98,7 @@ void WorkerScriptFetchInitiator::Start( @@ -98,7 +98,7 @@ void WorkerScriptFetchInitiator::Start(
@ -754,10 +754,10 @@ index 482499bdbb5e..c95d3c61847f 100644
std::move(subresource_loader_factories), std::move(subresource_loader_factories),
std::move(service_worker_context), appcache_handle_core, std::move(service_worker_context), appcache_handle_core,
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
index 9df16c695fcf..599cc201d9d5 100644 index 6e1403e84d1d..3d3e81335260 100644
--- content/public/browser/browser_context.h --- content/public/browser/browser_context.h
+++ content/public/browser/browser_context.h +++ content/public/browser/browser_context.h
@@ -242,6 +242,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { @@ -227,6 +227,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
BrowserContext(); BrowserContext();
@ -766,7 +766,7 @@ index 9df16c695fcf..599cc201d9d5 100644
~BrowserContext() override; ~BrowserContext() override;
// Shuts down the storage partitions associated to this browser context. // Shuts down the storage partitions associated to this browser context.
@@ -366,6 +368,13 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { @@ -362,6 +364,13 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
virtual download::InProgressDownloadManager* virtual download::InProgressDownloadManager*
RetriveInProgressDownloadManager(); RetriveInProgressDownloadManager();

2
patch/patches/trace_event.patch
View File

@ -1,5 +1,5 @@
diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
index 24405a11a0e0..78f8cb5fc36d 100644 index b4c7cb994726..4c2e6b85f3a0 100644
--- base/trace_event/builtin_categories.h --- base/trace_event/builtin_categories.h
+++ base/trace_event/builtin_categories.h +++ base/trace_event/builtin_categories.h
@@ -47,6 +47,8 @@ @@ -47,6 +47,8 @@

4
patch/patches/ui_dragdrop_355390.patch
View File

@ -1,9 +1,9 @@
diff --git ui/base/dragdrop/os_exchange_data_provider_aurax11.cc ui/base/dragdrop/os_exchange_data_provider_aurax11.cc diff --git ui/base/dragdrop/os_exchange_data_provider_aurax11.cc ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
index 144c8babf500..db03ed917279 100644 index c92301055164..48b510cf8d38 100644
--- ui/base/dragdrop/os_exchange_data_provider_aurax11.cc --- ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
+++ ui/base/dragdrop/os_exchange_data_provider_aurax11.cc +++ ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
@@ -141,7 +141,8 @@ void OSExchangeDataProviderAuraX11::SetURL(const GURL& url, @@ -141,7 +141,8 @@ void OSExchangeDataProviderAuraX11::SetURL(const GURL& url,
format_map_.Insert(gfx::GetAtom(Clipboard::kMimeTypeMozillaURL), mem); format_map_.Insert(gfx::GetAtom(kMimeTypeMozillaURL), mem);
// Set a string fallback as well. // Set a string fallback as well.
- SetString(spec); - SetString(spec);

25
patch/patches/v8_embed_924454.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git src/snapshot/embedded-file-writer.cc src/snapshot/embedded-file-writer.cc
index 9612fa6..6394287 100644
--- src/snapshot/embedded-file-writer.cc
+++ src/snapshot/embedded-file-writer.cc
@@ -4,6 +4,7 @@
#include "src/snapshot/embedded-file-writer.h"
+#include <algorithm>
#include <cinttypes>
#include "src/objects/code-inl.h"
@@ -613,7 +614,11 @@
void PlatformDependentEmbeddedFileWriter::DeclareExternalFilename(
int fileid, const char* filename) {
- fprintf(fp_, ".file %d \"%s\"\n", fileid, filename);
+ // Replace any Windows style paths (backslashes) with forward
+ // slashes.
+ std::string fixed_filename(filename);
+ std::replace(fixed_filename.begin(), fixed_filename.end(), '\\', '/');
+ fprintf(fp_, ".file %d \"%s\"\n", fileid, fixed_filename.c_str());
}
void PlatformDependentEmbeddedFileWriter::FileEpilogue() {}

18
patch/patches/views_1749_2102.patch
View File

@ -39,7 +39,7 @@ index bb53c043a8fe..e1427ac3a1ef 100644
virtual void MenuWillShow() {} virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index 1b7f2cf2ad75..e22afc917f7a 100644 index 68b99d49658d..a2f3a9c0819b 100644
--- ui/gfx/render_text.cc --- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc +++ ui/gfx/render_text.cc
@@ -514,6 +514,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) { @@ -514,6 +514,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) {
@ -70,7 +70,7 @@ index 1b7f2cf2ad75..e22afc917f7a 100644
+ gfx::RemoveAcceleratorChar(layout_text_, '&', &char_pos, &char_span); + gfx::RemoveAcceleratorChar(layout_text_, '&', &char_pos, &char_span);
+ if (char_pos != -1) { + if (char_pos != -1) {
+ gfx::Range range(char_pos, char_pos + char_span); + gfx::Range range(char_pos, char_pos + char_span);
+ styles_[gfx::UNDERLINE].ApplyValue(true, range); + styles_[TEXT_STYLE_UNDERLINE].ApplyValue(true, range);
+ } + }
+ } + }
+ +
@ -154,7 +154,7 @@ index 0200201196b2..6e1617c927ba 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..acd4f37446c6 100644 index ef1ed1092eb4..e913d9d50741 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) {
@ -207,7 +207,7 @@ index ef1ed1092eb4..acd4f37446c6 100644
+ render_text->SetText(text_str); + render_text->SetText(text_str);
+ if (range.IsValid()) { + if (range.IsValid()) {
+ render_text->SetDisplayRect(bounds()); + render_text->SetDisplayRect(bounds());
+ render_text->ApplyStyle(gfx::UNDERLINE, true, range); + render_text->ApplyStyle(gfx::TEXT_STYLE_UNDERLINE, true, range);
+ } + }
+ } else { + } else {
+ render_text->SetText(text()); + render_text->SetText(text());
@ -240,7 +240,7 @@ 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 d813c85b96d8..0fdaa9830c5f 100644 index f30abb99f6f0..2d1ecf4a198b 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
@@ -2508,8 +2508,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( @@ -2508,8 +2508,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@ -271,7 +271,7 @@ index d813c85b96d8..0fdaa9830c5f 100644
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY); SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
else if (item->GetParentMenuItem()->GetParentMenuItem()) else if (item->GetParentMenuItem()->GetParentMenuItem())
diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
index 234ef7e070c2..33e628613c5f 100644 index 921aef245bf3..4b7474c01c0e 100644
--- ui/views/controls/menu/menu_delegate.h --- ui/views/controls/menu/menu_delegate.h
+++ ui/views/controls/menu/menu_delegate.h +++ ui/views/controls/menu/menu_delegate.h
@@ -81,6 +81,22 @@ class VIEWS_EXPORT MenuDelegate { @@ -81,6 +81,22 @@ class VIEWS_EXPORT MenuDelegate {
@ -297,7 +297,7 @@ index 234ef7e070c2..33e628613c5f 100644
// The tooltip shown for the menu item. This is invoked when the user // The tooltip shown for the menu item. This is invoked when the user
// hovers over the item, and no tooltip text has been set for that item. // hovers over the item, and no tooltip text has been set for that item.
virtual base::string16 GetTooltipText(int id, virtual base::string16 GetTooltipText(int id,
@@ -209,6 +225,11 @@ class VIEWS_EXPORT MenuDelegate { @@ -208,6 +224,11 @@ class VIEWS_EXPORT MenuDelegate {
bool* has_mnemonics, bool* has_mnemonics,
MenuButton** button); MenuButton** button);
@ -482,7 +482,7 @@ index 0180b30d383a..c0724b6b80a7 100644
// Move the cursor because EnterNotify/LeaveNotify are generated with the // Move the cursor because EnterNotify/LeaveNotify are generated with the
// current mouse position as a result of XGrabPointer() // current mouse position as a result of XGrabPointer()
diff --git ui/views/view.h ui/views/view.h diff --git ui/views/view.h ui/views/view.h
index a46a3b0f795e..45f265ef98ed 100644 index 2aa7df41f179..206fedae27ba 100644
--- ui/views/view.h --- ui/views/view.h
+++ ui/views/view.h +++ ui/views/view.h
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
@ -493,7 +493,7 @@ index a46a3b0f795e..45f265ef98ed 100644
#include "build/build_config.h" #include "build/build_config.h"
#include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkPath.h"
#include "ui/accessibility/ax_enums.mojom.h" #include "ui/accessibility/ax_enums.mojom.h"
@@ -118,7 +119,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, @@ -119,7 +120,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
public ui::AcceleratorTarget, public ui::AcceleratorTarget,
public ui::EventTarget, public ui::EventTarget,
public ui::EventHandler, public ui::EventHandler,

4
patch/patches/web_contents_1257_1565.patch
View File

@ -1,5 +1,5 @@
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 9e41df626aa9..309dcbb9df52 100644 index bdc3ae99f2b3..f3c70ccd242a 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
@@ -2033,21 +2033,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2033,21 +2033,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@ -70,7 +70,7 @@ index 9e41df626aa9..309dcbb9df52 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.
@@ -6282,7 +6300,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { @@ -6288,7 +6306,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) { RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view = RenderWidgetHostViewBase* rwh_view =

6
patch/patches/webkit_plugin_info_2015.patch
View File

@ -26,7 +26,7 @@ index bfc4a95febcf..1d06dbbb09b0 100644
static void InitializeCommon(Platform* platform, static void InitializeCommon(Platform* platform,
std::unique_ptr<Thread> main_thread); std::unique_ptr<Thread> main_thread);
diff --git third_party/blink/renderer/core/dom/dom_implementation.cc third_party/blink/renderer/core/dom/dom_implementation.cc diff --git third_party/blink/renderer/core/dom/dom_implementation.cc third_party/blink/renderer/core/dom/dom_implementation.cc
index 3dac1a5a6f61..4fff23e66f2c 100644 index 31d7915a56b1..3867128de143 100644
--- third_party/blink/renderer/core/dom/dom_implementation.cc --- third_party/blink/renderer/core/dom/dom_implementation.cc
+++ third_party/blink/renderer/core/dom/dom_implementation.cc +++ third_party/blink/renderer/core/dom/dom_implementation.cc
@@ -243,10 +243,11 @@ Document* DOMImplementation::createDocument(const String& type, @@ -243,10 +243,11 @@ Document* DOMImplementation::createDocument(const String& type,
@ -44,10 +44,10 @@ index 3dac1a5a6f61..4fff23e66f2c 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 e07ace500ef1..76683aefc31f 100644 index 9c8ffb99f78e..baa128f55603 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
@@ -1322,7 +1322,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { @@ -1323,7 +1323,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
PluginData* LocalFrame::GetPluginData() const { PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr; return nullptr;

4
patch/patches/webkit_pointer_event_781966.patch
View File

@ -1,8 +1,8 @@
diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc
index 9c92b4269edc..112e194a4655 100644 index 49c6ec343bd6..e8a00e915a70 100644
--- third_party/blink/renderer/core/input/pointer_event_manager.cc --- third_party/blink/renderer/core/input/pointer_event_manager.cc
+++ third_party/blink/renderer/core/input/pointer_event_manager.cc +++ third_party/blink/renderer/core/input/pointer_event_manager.cc
@@ -281,7 +281,7 @@ void PointerEventManager::HandlePointerInterruption( @@ -282,7 +282,7 @@ void PointerEventManager::HandlePointerInterruption(
for (auto pointer_event : canceled_pointer_events) { for (auto pointer_event : canceled_pointer_events) {
// If we are sending a pointercancel we have sent the pointerevent to some // If we are sending a pointercancel we have sent the pointerevent to some
// target before. // target before.

10
patch/patches/webkit_popups.patch
View File

@ -11,10 +11,10 @@ index f7f0ae5b0c70..005b4c37fc7d 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 a8d8c5185990..897f6ce08235 100644 index 2455c3728620..3182a7999e05 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
@@ -235,8 +235,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -236,8 +236,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
g_should_use_external_popup_menus = use_external_popup_menus; g_should_use_external_popup_menus = use_external_popup_menus;
} }
@ -30,7 +30,7 @@ index a8d8c5185990..897f6ce08235 100644
} }
namespace { namespace {
@@ -307,6 +312,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, @@ -308,6 +313,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
enable_fake_page_scale_animation_for_testing_(false), enable_fake_page_scale_animation_for_testing_(false),
fake_page_scale_animation_page_scale_factor_(0), fake_page_scale_animation_page_scale_factor_(0),
fake_page_scale_animation_use_anchor_(false), fake_page_scale_animation_use_anchor_(false),
@ -39,7 +39,7 @@ index a8d8c5185990..897f6ce08235 100644
suppress_next_keypress_event_(false), suppress_next_keypress_event_(false),
ime_accept_events_(true), ime_accept_events_(true),
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 efb4a7238d42..6409cfbd400e 100644 index c83d975c7b04..f6a1e331cc31 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
@@ -107,7 +107,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -107,7 +107,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@ -62,7 +62,7 @@ index efb4a7238d42..6409cfbd400e 100644
TransformationMatrix device_emulation_transform_; TransformationMatrix device_emulation_transform_;
diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
index 3c2fc7f4f2e8..84ce86d63bed 100644 index 939f59cac349..2609c587d80d 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc --- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -809,7 +809,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { @@ -809,7 +809,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {

4
patch/patches/webview_plugin_2020.patch
View File

@ -1,8 +1,8 @@
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 d0b19311470a..a9b047fbac52 100644 index 3706703c4eb4..3f9d4367af44 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -4560,7 +4560,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4563,7 +4563,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message> </message>
</if> </if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy."> <message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">