bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-23 07:27:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 68.0.3416.0 (#554961)

Browse Source
This commit is contained in:
Marshall Greenblatt 2018-05-18 13:45:18 +03:00
parent 240ba800ed
commit a9f0fa9dfe
41 changed files with 322 additions and 292 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
{
'chromium_checkout': 'refs/tags/68.0.3409.0',
'chromium_checkout': 'refs/tags/68.0.3416.0',
}

1
include/base/cef_string16.h
View File

@ -164,6 +164,7 @@ typedef std::basic_string<char16, string16_char_traits> string16;
namespace base {
typedef cef::base::char16 char16;
typedef cef::base::string16 string16;
extern std::ostream& operator<<(std::ostream& out, const string16& str);

106
libcef/browser/browser_host_impl.cc
View File

@ -352,13 +352,13 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::Create(
&wc_create_params.view, &wc_create_params.delegate_view);
}
content::WebContents* web_contents =
std::unique_ptr<content::WebContents> web_contents =
content::WebContents::Create(wc_create_params);
DCHECK(web_contents);
CefRefPtr<CefBrowserHostImpl> browser = CefBrowserHostImpl::CreateInternal(
create_params.settings, create_params.client, web_contents, info,
create_params.devtools_opener, is_devtools_popup,
CefRefPtr<CefBrowserHostImpl> browser = CreateInternal(
create_params.settings, create_params.client, web_contents.release(),
true, info, create_params.devtools_opener, is_devtools_popup,
create_params.request_context, std::move(platform_delegate),
cef_extension);
if (!browser)
@ -366,7 +366,7 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::Create(
if (create_params.extension) {
browser->CreateExtensionHost(create_params.extension, browser_context,
web_contents, create_params.url,
browser->web_contents(), create_params.url,
create_params.extension_host_type);
} else if (!create_params.url.is_empty()) {
browser->LoadURL(CefFrameHostImpl::kMainFrameId, create_params.url.spec(),
@ -382,6 +382,7 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::CreateInternal(
const CefBrowserSettings& settings,
CefRefPtr<CefClient> client,
content::WebContents* web_contents,
bool own_web_contents,
scoped_refptr<CefBrowserInfo> browser_info,
CefRefPtr<CefBrowserHostImpl> opener,
bool is_devtools_popup,
@ -415,6 +416,8 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::CreateInternal(
CefRefPtr<CefBrowserHostImpl> browser = new CefBrowserHostImpl(
settings, client, web_contents, browser_info, opener, request_context,
std::move(platform_delegate), extension);
if (own_web_contents)
browser->set_owned_web_contents(web_contents);
if (!browser->CreateHostWindow())
return nullptr;
@ -819,7 +822,7 @@ void CefBrowserHostImpl::Find(int identifier,
bool matchCase,
bool findNext) {
if (CEF_CURRENTLY_ON_UIT()) {
if (!web_contents_)
if (!web_contents())
return;
// Every find request must have a unique ID and these IDs must strictly
@ -844,7 +847,7 @@ void CefBrowserHostImpl::Find(int identifier,
void CefBrowserHostImpl::StopFinding(bool clearSelection) {
if (CEF_CURRENTLY_ON_UIT()) {
if (!web_contents_)
if (!web_contents())
return;
content::StopFindAction action =
@ -862,7 +865,7 @@ void CefBrowserHostImpl::ShowDevTools(const CefWindowInfo& windowInfo,
const CefBrowserSettings& settings,
const CefPoint& inspect_element_at) {
if (CEF_CURRENTLY_ON_UIT()) {
if (!web_contents_)
if (!web_contents())
return;
if (devtools_frontend_) {
@ -1281,8 +1284,8 @@ void CefBrowserHostImpl::GoBack() {
return;
}
if (web_contents_.get() && web_contents_->GetController().CanGoBack())
web_contents_->GetController().GoBack();
if (web_contents() && web_contents()->GetController().CanGoBack())
web_contents()->GetController().GoBack();
} else {
CEF_POST_TASK(CEF_UIT, base::Bind(&CefBrowserHostImpl::GoBack, this));
}
@ -1301,8 +1304,8 @@ void CefBrowserHostImpl::GoForward() {
return;
}
if (web_contents_.get() && web_contents_->GetController().CanGoForward())
web_contents_->GetController().GoForward();
if (web_contents() && web_contents()->GetController().CanGoForward())
web_contents()->GetController().GoForward();
} else {
CEF_POST_TASK(CEF_UIT, base::Bind(&CefBrowserHostImpl::GoForward, this));
}
@ -1321,8 +1324,8 @@ void CefBrowserHostImpl::Reload() {
return;
}
if (web_contents_.get())
web_contents_->GetController().Reload(content::ReloadType::NORMAL, true);
if (web_contents())
web_contents()->GetController().Reload(content::ReloadType::NORMAL, true);
} else {
CEF_POST_TASK(CEF_UIT, base::Bind(&CefBrowserHostImpl::Reload, this));
}
@ -1337,8 +1340,8 @@ void CefBrowserHostImpl::ReloadIgnoreCache() {
return;
}
if (web_contents_.get()) {
web_contents_->GetController().Reload(
if (web_contents()) {
web_contents()->GetController().Reload(
content::ReloadType::BYPASSING_CACHE, true);
}
} else {
@ -1355,8 +1358,8 @@ void CefBrowserHostImpl::StopLoad() {
return;
}
if (web_contents_.get())
web_contents_->Stop();
if (web_contents())
web_contents()->Stop();
} else {
CEF_POST_TASK(CEF_UIT, base::Bind(&CefBrowserHostImpl::StopLoad, this));
}
@ -1544,7 +1547,8 @@ void CefBrowserHostImpl::DestroyBrowser() {
registrar_.reset(NULL);
response_manager_.reset(NULL);
content::WebContentsObserver::Observe(NULL);
web_contents_.reset(NULL);
if (owned_web_contents_)
owned_web_contents_.reset(NULL);
// Delete objects created by the platform delegate that may be referenced by
// the WebContents.
@ -1654,7 +1658,7 @@ void CefBrowserHostImpl::LoadURL(int64 frame_id,
return;
}
if (web_contents_.get()) {
if (web_contents()) {
GURL gurl = GURL(url);
if (!gurl.is_valid() && !gurl.has_scheme()) {
@ -1669,8 +1673,8 @@ void CefBrowserHostImpl::LoadURL(int64 frame_id,
return;
}
web_contents_->GetController().LoadURL(gurl, referrer, transition,
extra_headers);
web_contents()->GetController().LoadURL(gurl, referrer, transition,
extra_headers);
OnSetFocus(FOCUS_SOURCE_NAVIGATION);
}
} else {
@ -1853,8 +1857,8 @@ int CefBrowserHostImpl::browser_id() const {
content::BrowserContext* CefBrowserHostImpl::GetBrowserContext() {
CEF_REQUIRE_UIT();
if (web_contents_)
return web_contents_->GetBrowserContext();
if (web_contents())
return web_contents()->GetBrowserContext();
return nullptr;
}
@ -2181,15 +2185,25 @@ bool CefBrowserHostImpl::ShouldTransferNavigation(
return true;
}
void CefBrowserHostImpl::AddNewContents(content::WebContents* source,
content::WebContents* new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
bool* was_blocked) {
void CefBrowserHostImpl::AddNewContents(
content::WebContents* source,
std::unique_ptr<content::WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
bool* was_blocked) {
CefRefPtr<CefBrowserHostImpl> owner =
GetBrowserForContents(new_contents.get());
if (owner) {
// Taking ownership of |new_contents|.
owner->set_owned_web_contents(new_contents.release());
return;
}
if (extension_host_) {
extension_host_->AddNewContents(source, new_contents, disposition,
initial_rect, user_gesture, was_blocked);
extension_host_->AddNewContents(source, std::move(new_contents),
disposition, initial_rect, user_gesture,
was_blocked);
}
}
@ -2469,10 +2483,12 @@ void CefBrowserHostImpl::WebContentsCreated(
static_cast<CefBrowserContext*>(new_contents->GetBrowserContext());
DCHECK(browser_context);
CefRefPtr<CefBrowserHostImpl> browser = CefBrowserHostImpl::CreateInternal(
settings, client, new_contents, info, opener, false,
browser_context->GetCefRequestContext(), std::move(platform_delegate),
nullptr);
// We don't officially own |new_contents| until AddNewContents() is called.
// However, we need to install observers/delegates here.
CefRefPtr<CefBrowserHostImpl> browser =
CreateInternal(settings, client, new_contents, false, info, opener, false,
browser_context->GetCefRequestContext(),
std::move(platform_delegate), nullptr);
}
void CefBrowserHostImpl::DidNavigateMainFramePostCommit(
@ -3117,7 +3133,6 @@ CefBrowserHostImpl::CefBrowserHostImpl(
DCHECK(!browser_info_->browser().get());
browser_info_->set_browser(this);
web_contents_.reset(web_contents);
web_contents->SetDelegate(this);
// Associate the WebContents with this browser object.
@ -3136,15 +3151,15 @@ CefBrowserHostImpl::CefBrowserHostImpl(
response_manager_.reset(new CefResponseManager);
PrefsTabHelper::CreateForWebContents(web_contents_.get());
printing::CefPrintViewManager::CreateForWebContents(web_contents_.get());
PrefsTabHelper::CreateForWebContents(web_contents);
printing::CefPrintViewManager::CreateForWebContents(web_contents);
if (extensions::ExtensionsEnabled()) {
extensions::CefExtensionWebContentsObserver::CreateForWebContents(
web_contents_.get());
web_contents);
// Used by the tabs extension API.
zoom::ZoomController::CreateForWebContents(web_contents_.get());
zoom::ZoomController::CreateForWebContents(web_contents);
}
// Make sure RenderViewCreated is called at least one time.
@ -3154,6 +3169,15 @@ CefBrowserHostImpl::CefBrowserHostImpl(
platform_delegate_->BrowserCreated(this);
}
void CefBrowserHostImpl::set_owned_web_contents(
content::WebContents* owned_contents) {
// Should not currently own a WebContents.
CHECK(!owned_web_contents_);
// Should already be associated with |owned_contents|.
CHECK(web_contents() == owned_contents);
owned_web_contents_.reset(owned_contents);
}
bool CefBrowserHostImpl::CreateHostWindow() {
// |host_window_handle_| will not change after initial host creation for
// non-views-hosted browsers.

12
libcef/browser/browser_host_impl.h
View File

@ -400,7 +400,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
const content::OpenURLParams& params) override;
bool ShouldTransferNavigation(bool is_main_frame_navigation) override;
void AddNewContents(content::WebContents* source,
content::WebContents* new_contents,
std::unique_ptr<content::WebContents> new_contents,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture,
@ -527,6 +527,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
const CefBrowserSettings& settings,
CefRefPtr<CefClient> client,
content::WebContents* web_contents,
bool own_web_contents,
scoped_refptr<CefBrowserInfo> browser_info,
CefRefPtr<CefBrowserHostImpl> opener,
bool is_devtools_popup,
@ -564,6 +565,8 @@ class CefBrowserHostImpl : public CefBrowserHost,
std::unique_ptr<CefBrowserPlatformDelegate> platform_delegate,
CefRefPtr<CefExtension> extension);
void set_owned_web_contents(content::WebContents* owned_contents);
// Give the platform delegate an opportunity to create the host window.
bool CreateHostWindow();
@ -635,7 +638,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
CefBrowserSettings settings_;
CefRefPtr<CefClient> client_;
std::unique_ptr<content::WebContents> web_contents_;
scoped_refptr<CefBrowserInfo> browser_info_;
CefWindowHandle opener_;
CefRefPtr<CefRequestContext> request_context_;
@ -644,6 +646,12 @@ class CefBrowserHostImpl : public CefBrowserHost,
const bool is_views_hosted_;
CefWindowHandle host_window_handle_;
// Non-nullptr if this object owns the WebContents. Will be nullptr for popup
// browsers between the calls to WebContentsCreated() and AddNewContents(),
// and may never be set if the parent browser is destroyed during popup
// creation.
std::unique_ptr<content::WebContents> owned_web_contents_;
// Volatile state information. All access must be protected by the state lock.
base::Lock state_lock_;
bool is_loading_;

4
libcef/browser/browser_main.cc
View File

@ -30,10 +30,10 @@
#include "chrome/browser/chrome_browser_main_extra_parts.h"
#include "chrome/browser/plugins/plugin_finder.h"
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/common/result_codes.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/constants.h"
#include "net/base/net_module.h"
#include "services/service_manager/embedder/result_codes.h"
#include "ui/base/resource/resource_bundle.h"
#if defined(USE_AURA)
@ -80,7 +80,7 @@ int CefBrowserMainParts::PreEarlyInitialization() {
for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
chrome_extra_parts_[i]->PreEarlyInitialization();
return content::RESULT_CODE_NORMAL_EXIT;
return service_manager::RESULT_CODE_NORMAL_EXIT;
}
void CefBrowserMainParts::PostEarlyInitialization() {

5
libcef/browser/content_browser_client.cc
View File

@ -86,6 +86,7 @@
#include "extensions/common/switches.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "ppapi/host/ppapi_host.h"
#include "services/service_manager/embedder/switches.h"
#include "services/service_manager/public/mojom/connector.mojom.h"
#include "services/service_manager/sandbox/switches.h"
#include "storage/browser/quota/quota_settings.h"
@ -720,7 +721,7 @@ void CefContentBrowserClient::AppendExtraCommandLineSwitches(
}
#if defined(OS_LINUX)
if (process_type == switches::kZygoteProcess) {
if (process_type == service_manager::switches::kZygoteProcess) {
// Propagate the following switches to the zygote command line (along with
// any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {
@ -982,7 +983,7 @@ void CefContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
content::PosixFileDescriptorInfo* mappings) {
int crash_signal_fd = GetCrashSignalFD(command_line);
if (crash_signal_fd >= 0) {
mappings->Share(kCrashDumpSignal, crash_signal_fd);
mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
}
}
#endif // defined(OS_LINUX)

12
libcef/browser/extensions/extension_host_delegate.cc
View File

@ -7,6 +7,7 @@
#include "libcef/browser/extensions/extensions_browser_client.h"
#include "base/logging.h"
#include "content/public/browser/web_contents.h"
namespace extensions {
@ -28,11 +29,12 @@ CefExtensionHostDelegate::GetJavaScriptDialogManager() {
return NULL;
}
void CefExtensionHostDelegate::CreateTab(content::WebContents* web_contents,
const std::string& extension_id,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture) {
void CefExtensionHostDelegate::CreateTab(
std::unique_ptr<content::WebContents> web_contents,
const std::string& extension_id,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture) {
// TODO(cef): Add support for extensions opening popup windows.
NOTIMPLEMENTED();
}

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

@ -21,7 +21,7 @@ class CefExtensionHostDelegate : public ExtensionHostDelegate {
void OnExtensionHostCreated(content::WebContents* web_contents) override;
void OnRenderViewCreatedForBackgroundPage(ExtensionHost* host) override;
content::JavaScriptDialogManager* GetJavaScriptDialogManager() override;
void CreateTab(content::WebContents* web_contents,
void CreateTab(std::unique_ptr<content::WebContents> web_contents,
const std::string& extension_id,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,

4
libcef/browser/native/menu_runner_mac.mm
View File

@ -9,6 +9,7 @@
#include "base/compiler_specific.h"
#import "base/mac/scoped_sending_event.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_current.h"
#import "ui/base/cocoa/menu_controller.h"
#include "ui/gfx/geometry/point.h"
@ -33,8 +34,7 @@ bool CefMenuRunnerMac::RunContextMenu(
menu_controller_);
// Make sure events can be pumped while the menu is up.
base::MessageLoop::ScopedNestableTaskAllower allow(
base::MessageLoop::current());
base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
// One of the events that could be pumped is |window.close()|.
// User-initiated event-tracking loops protect against this by

4
libcef/browser/native/menu_runner_win.cc
View File

@ -8,6 +8,7 @@
#include "libcef/browser/native/menu_2.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_current.h"
#include "ui/gfx/geometry/point.h"
CefMenuRunnerWin::CefMenuRunnerWin() {}
@ -21,8 +22,7 @@ bool CefMenuRunnerWin::RunContextMenu(
menu_->Rebuild(NULL);
// Make sure events can be pumped while the menu is up.
base::MessageLoop::ScopedNestableTaskAllower allow(
base::MessageLoop::current());
base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
const gfx::Point& screen_point =
browser->GetScreenPoint(gfx::Point(params.x, params.y));

4
libcef/browser/osr/browser_platform_delegate_osr.cc
View File

@ -13,6 +13,7 @@
#include "libcef/browser/osr/web_contents_view_osr.h"
#include "libcef/common/drag_data_impl.h"
#include "base/message_loop/message_loop_current.h"
#include "content/browser/renderer_host/render_widget_host_input_event_router.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/render_view_host.h"
@ -455,8 +456,7 @@ void CefBrowserPlatformDelegateOsr::StartDragging(
CefRefPtr<CefDragDataImpl> drag_data(
new CefDragDataImpl(drop_data, cef_image, cef_image_pos));
drag_data->SetReadOnly(true);
base::MessageLoop::ScopedNestableTaskAllower allow(
base::MessageLoop::current());
base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
handled = handler->StartDragging(
browser_, drag_data.get(),
static_cast<CefRenderHandler::DragOperationsMask>(allowed_ops),

7
libcef/browser/osr/render_widget_host_view_osr_mac.mm
View File

@ -61,13 +61,6 @@ class MacHelper : public content::BrowserCompositorMacClient,
return nil;
}
void AcceleratedWidgetGetVSyncParameters(
base::TimeTicks* timebase,
base::TimeDelta* interval) const override {
*timebase = base::TimeTicks();
*interval = base::TimeDelta();
}
void AcceleratedWidgetSwapCompleted() override {}
void DidReceiveFirstFrameAfterNavigation() override {

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

@ -13,6 +13,7 @@
#include "base/memory/ref_counted_memory.h"
#include "base/memory/shared_memory.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_current.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/utf_string_conversions.h"
@ -485,8 +486,7 @@ bool CefPrintViewManagerBase::RunInnerMessageLoop() {
// Need to enable recursive task.
{
base::MessageLoop::ScopedNestableTaskAllower allow(
base::MessageLoop::current());
base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
run_loop.Run();
}

3
libcef/common/crash_reporter_client.cc
View File

@ -18,6 +18,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "components/crash/core/common/crash_key.h"
#include "services/service_manager/embedder/switches.h"
#include "third_party/crashpad/crashpad/client/annotation.h"
#if defined(OS_MACOSX)
@ -623,7 +624,7 @@ bool CefCrashReporterClient::EnableBreakpadForProcess(
const std::string& process_type) {
return process_type == switches::kRendererProcess ||
process_type == switches::kPpapiPluginProcess ||
process_type == switches::kZygoteProcess ||
process_type == service_manager::switches::kZygoteProcess ||
process_type == switches::kGpuProcess;
}

3
libcef/common/crash_reporting.cc
View File

@ -16,6 +16,7 @@
#include "components/crash/core/common/crash_key.h"
#include "components/crash/core/common/crash_keys.h"
#include "content/public/common/content_switches.h"
#include "services/service_manager/embedder/switches.h"
#if defined(OS_MACOSX)
#include "base/mac/foundation_util.h"
@ -130,7 +131,7 @@ void InitCrashReporter(const base::CommandLine& command_line,
#else // !defined(OS_MACOSX)
breakpad::SetCrashServerURL(crash_client->GetCrashServerURL());
if (process_type != switches::kZygoteProcess) {
if (process_type != service_manager::switches::kZygoteProcess) {
// Crash reporting for subprocesses created using the zygote will be
// initialized in ZygoteForked.
breakpad::InitCrashReporter(process_type);

3
libcef/common/widevine_loader.cc
View File

@ -25,6 +25,7 @@
#include "content/public/common/content_switches.h"
#include "media/cdm/cdm_host_file.h"
#include "media/cdm/supported_cdm_versions.h"
#include "services/service_manager/embedder/switches.h"
#include "services/service_manager/sandbox/switches.h"
namespace {
@ -355,7 +356,7 @@ void CefWidevineLoader::AddContentDecryptionModules(
// errors during plugin loading. This is because the Zygote process must pre-
// load all plugins before initializing the sandbox.
if (command_line.GetSwitchValueASCII(switches::kProcessType) !=
switches::kZygoteProcess ||
service_manager::switches::kZygoteProcess ||
command_line.HasSwitch(service_manager::switches::kNoSandbox)) {
return;
}

6
patch/patches/browser_compositor_mac.patch
View File

@ -17,10 +17,10 @@ index 6ad9f5fb334d..d7bf762314a4 100644
void DidCreateNewRendererCompositorFrameSink(
viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm
index 13a7da672959..28b0ab2d0e1a 100644
index f8d3575e06dc..688aa7e5b117 100644
--- content/browser/renderer_host/browser_compositor_view_mac.mm
+++ content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -208,6 +208,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
@@ -206,6 +206,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
g_spare_recyclable_compositors.Get().clear();
}
@ -34,7 +34,7 @@ index 13a7da672959..28b0ab2d0e1a 100644
if (recyclable_compositor_) {
return recyclable_compositor_->accelerated_widget_mac()
diff --git ui/accelerated_widget_mac/accelerated_widget_mac.mm ui/accelerated_widget_mac/accelerated_widget_mac.mm
index 97e7b502f15d..44811edbda4c 100644
index 0de89795c461..3d46421491a9 100644
--- ui/accelerated_widget_mac/accelerated_widget_mac.mm
+++ ui/accelerated_widget_mac/accelerated_widget_mac.mm
@@ -71,6 +71,10 @@ void AcceleratedWidgetMac::SetNSView(AcceleratedWidgetMacNSView* view) {

20
patch/patches/browser_plugin_guest_1565.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
index 6508c1e0dacf..0241d11f664d 100644
index ab0b50b62aac..d17bc04e53bf 100644
--- content/browser/browser_plugin/browser_plugin_guest.cc
+++ content/browser/browser_plugin/browser_plugin_guest.cc
@@ -315,8 +315,11 @@ void BrowserPluginGuest::InitInternal(
@ -221,10 +221,10 @@ index 968c5157ab41..22aad9fbafa4 100644
RenderWidgetHost* render_widget_host) 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
index 8a69fdb183bc..7fb05f4a755e 100644
index 8cd612e1f03a..5cf012b31bda 100644
--- content/browser/web_contents/web_contents_view_mac.mm
+++ content/browser/web_contents/web_contents_view_mac.mm
@@ -345,7 +345,8 @@ void WebContentsViewMac::CreateView(
@@ -348,7 +348,8 @@ void WebContentsViewMac::CreateView(
}
RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
@ -234,7 +234,7 @@ index 8a69fdb183bc..7fb05f4a755e 100644
if (render_widget_host->GetView()) {
// 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
@@ -357,6 +358,7 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
@@ -360,6 +361,7 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
render_widget_host->GetView());
}
@ -266,19 +266,19 @@ index d05dd5421458..fa13775f0512 100644
// a BrowserPlugin even when we are using cross process frames for guests. It
// should be removed after resolving https://crbug.com/642826).
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index 6861814915c2..766090cd3b06 100644
index 54c9b6320d9c..d474ead5f147 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -192,6 +192,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -193,6 +193,8 @@ void MimeHandlerViewGuest::CreateWebContents(
WebContents::CreateParams params(browser_context(),
guest_site_instance.get());
params.guest_delegate = this;
+ if (delegate_)
+ delegate_->OverrideWebContentsCreateParams(&params);
callback.Run(WebContents::Create(params));
registry_.AddInterface(
@@ -225,6 +227,18 @@ bool MimeHandlerViewGuest::ShouldDestroyOnDetach() const {
// TODO(erikchen): Fix ownership semantics for guest views.
// https://crbug.com/832879.
auto* web_contents = WebContents::Create(params).release();
@@ -230,6 +232,18 @@ bool MimeHandlerViewGuest::ShouldDestroyOnDetach() const {
return true;
}

6
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index c504d191374e..10f4a146d271 100644
index aa1294af0a9a..c3606b23c821 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index c504d191374e..10f4a146d271 100644
import("//chrome/common/features.gni")
import("//components/feature_engagement/features.gni")
import("//components/nacl/features.gni")
@@ -1576,6 +1577,7 @@ jumbo_split_static_library("browser") {
@@ -1574,6 +1575,7 @@ jumbo_split_static_library("browser") {
"//base:i18n",
"//base/allocator:buildflags",
"//cc",
@ -18,7 +18,7 @@ index c504d191374e..10f4a146d271 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -1837,6 +1839,10 @@ jumbo_split_static_library("browser") {
@@ -1834,6 +1836,10 @@ jumbo_split_static_library("browser") {
]
}

2
patch/patches/chrome_browser_content_settings.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
index 07ebea6a6ebf..d60387aa4cdf 100644
index 6745fbf917e2..0eec77c1aa72 100644
--- chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -7,6 +7,7 @@

2
patch/patches/chrome_widevine.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc
index d15599593511..0f37d5933391 100644
index df43d2bfaec6..aa2da0e9a15b 100644
--- chrome/common/chrome_content_client.cc
+++ chrome/common/chrome_content_client.cc
@@ -92,7 +92,8 @@

4
patch/patches/compositor_1368.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc
index 9d5348d73ae1..e4b7905a7137 100644
index 917b51464fce..cdb5213d12d4 100644
--- content/browser/compositor/gpu_process_transport_factory.cc
+++ content/browser/compositor/gpu_process_transport_factory.cc
@@ -496,9 +496,19 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
@@ -504,9 +504,19 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
// surfaces as they are not following the correct mode.
DisableGpuCompositing(compositor.get());
}

74
patch/patches/content_2015.patch
View File

@ -76,10 +76,10 @@ index dfbad402f1ea..7a332ea67611 100644
mime_type, false, NULL, &plugin, NULL));
}
diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
index 0c0c4cbb9efe..4703ce943367 100644
index de4e732fd84f..48a68c7f83f1 100644
--- content/browser/frame_host/navigation_handle_impl.cc
+++ content/browser/frame_host/navigation_handle_impl.cc
@@ -382,12 +382,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
@@ -383,12 +383,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
}
RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() {
@ -93,10 +93,10 @@ index 0c0c4cbb9efe..4703ce943367 100644
}
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index b358a15ebb1f..e135a52c2b5f 100644
index 1e13fa2ee857..1b6b236a8196 100644
--- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc
@@ -1543,6 +1543,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
@@ -1550,6 +1550,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
if (GetNavigationHandle()) {
GetNavigationHandle()->set_net_error_code(
static_cast<net::Error>(params.error_code));
@ -104,8 +104,8 @@ index b358a15ebb1f..e135a52c2b5f 100644
}
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
@@ -3432,9 +3433,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
&QuotaDispatcherHost::CreateForFrame, GetProcess(), routing_id_));
@@ -3436,9 +3437,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
- StoragePartitionImpl* storage_partition =
@ -117,7 +117,7 @@ index b358a15ebb1f..e135a52c2b5f 100644
// TODO(https://crbug.com/813479): Investigate why we need to explicitly
// specify task runner for BrowserThread::IO here.
// Bind calls to the BindRegistry should come on to the IO thread by
@@ -3708,9 +3709,9 @@ void RenderFrameHostImpl::CommitNavigation(
@@ -3712,9 +3713,9 @@ void RenderFrameHostImpl::CommitNavigation(
// however only do this for cross-document navigations, because the
// alternative would be redundant effort.
network::mojom::URLLoaderFactoryPtrInfo default_factory_info;
@ -130,7 +130,7 @@ index b358a15ebb1f..e135a52c2b5f 100644
if (subresource_loader_params &&
subresource_loader_params->loader_factory_info.is_valid()) {
// If the caller has supplied a default URLLoaderFactory override (for
@@ -4331,8 +4332,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
@@ -4355,8 +4356,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve(
// Keep DevTools proxy lasy, i.e. closest to the network.
RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory(
this, false, false, &default_factory_request);
@ -142,10 +142,10 @@ index b358a15ebb1f..e135a52c2b5f 100644
storage_partition->GetNetworkContext()->CreateURLLoaderFactory(
std::move(default_factory_request), GetProcess()->GetID());
diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc
index 80fd7cf89578..8e965cd18a47 100644
index d6ae1864eee2..31169d0bf4d0 100644
--- content/browser/frame_host/render_frame_message_filter.cc
+++ content/browser/frame_host/render_frame_message_filter.cc
@@ -552,6 +552,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
@@ -581,6 +581,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id,
void RenderFrameMessageFilter::OnGetPlugins(
bool refresh,
@ -153,7 +153,7 @@ index 80fd7cf89578..8e965cd18a47 100644
const url::Origin& main_frame_origin,
IPC::Message* reply_msg) {
// Don't refresh if the specified threshold has not been passed. Note that
@@ -573,18 +574,19 @@ void RenderFrameMessageFilter::OnGetPlugins(
@@ -602,18 +603,19 @@ void RenderFrameMessageFilter::OnGetPlugins(
PluginServiceImpl::GetInstance()->GetPlugins(
base::BindOnce(&RenderFrameMessageFilter::GetPluginsCallback, this,
@ -175,7 +175,7 @@ index 80fd7cf89578..8e965cd18a47 100644
int routing_id = MSG_ROUTING_NONE;
// In this loop, copy the WebPluginInfo (and do not use a reference) because
// the filter might mutate it.
@@ -593,7 +595,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
@@ -622,7 +624,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
if (!filter ||
filter->IsPluginAvailable(child_process_id, routing_id,
resource_context_, main_frame_origin.GetURL(),
@ -184,7 +184,7 @@ index 80fd7cf89578..8e965cd18a47 100644
plugins.push_back(plugin);
}
}
@@ -605,6 +607,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
@@ -634,6 +636,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
void RenderFrameMessageFilter::OnGetPluginInfo(
int render_frame_id,
const GURL& url,
@ -192,7 +192,7 @@ index 80fd7cf89578..8e965cd18a47 100644
const url::Origin& main_frame_origin,
const std::string& mime_type,
bool* found,
@@ -613,8 +616,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
@@ -642,8 +645,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo(
bool allow_wildcard = true;
*found = plugin_service_->GetPluginInfo(
render_process_id_, render_frame_id, resource_context_, url,
@ -204,10 +204,10 @@ index 80fd7cf89578..8e965cd18a47 100644
void RenderFrameMessageFilter::OnOpenChannelToPepperPlugin(
diff --git content/browser/frame_host/render_frame_message_filter.h content/browser/frame_host/render_frame_message_filter.h
index 871e11f61274..5b1009ab7ec6 100644
index 7f3ab224bd15..7fb3e94d8756 100644
--- content/browser/frame_host/render_frame_message_filter.h
+++ content/browser/frame_host/render_frame_message_filter.h
@@ -139,13 +139,16 @@ class CONTENT_EXPORT RenderFrameMessageFilter
@@ -142,13 +142,16 @@ class CONTENT_EXPORT RenderFrameMessageFilter
#if BUILDFLAG(ENABLE_PLUGINS)
void OnGetPlugins(bool refresh,
@ -274,10 +274,10 @@ index 4e11056a3dc9..973ad50975e1 100644
const std::string& mime_type,
bool allow_wildcard,
diff --git content/common/frame_messages.h content/common/frame_messages.h
index a11c302892a1..3745a11b34dd 100644
index 5b1b0371b087..deaee55626dd 100644
--- content/common/frame_messages.h
+++ content/common/frame_messages.h
@@ -1390,8 +1390,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
@@ -1391,8 +1391,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// Used to get the list of plugins. |main_frame_origin| is used to handle
// exceptions for plugin content settings.
@ -288,7 +288,7 @@ index a11c302892a1..3745a11b34dd 100644
url::Origin /* main_frame_origin */,
std::vector<content::WebPluginInfo> /* plugins */)
@@ -1399,9 +1400,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
@@ -1400,9 +1401,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
// type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the
// found plugin.
@ -301,10 +301,10 @@ index a11c302892a1..3745a11b34dd 100644
std::string /* mime_type */,
bool /* found */,
diff --git content/ppapi_plugin/ppapi_blink_platform_impl.cc content/ppapi_plugin/ppapi_blink_platform_impl.cc
index a6e5823a51d7..397bb78e41fb 100644
index 0128170c0aa0..0b5e4afcd91c 100644
--- content/ppapi_plugin/ppapi_blink_platform_impl.cc
+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
@@ -199,6 +199,7 @@ blink::WebThemeEngine* PpapiBlinkPlatformImpl::ThemeEngine() {
@@ -194,6 +194,7 @@ blink::WebThemeEngine* PpapiBlinkPlatformImpl::ThemeEngine() {
void PpapiBlinkPlatformImpl::GetPluginList(
bool refresh,
@ -313,10 +313,10 @@ index a6e5823a51d7..397bb78e41fb 100644
blink::WebPluginListBuilder* builder) {
NOTREACHED();
diff --git content/ppapi_plugin/ppapi_blink_platform_impl.h content/ppapi_plugin/ppapi_blink_platform_impl.h
index 8a58a2ae1e2f..21b18ff2eba7 100644
index 676ce592da16..acb36c5b2a5f 100644
--- content/ppapi_plugin/ppapi_blink_platform_impl.h
+++ content/ppapi_plugin/ppapi_blink_platform_impl.h
@@ -40,6 +40,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -39,6 +39,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl {
blink::WebString DefaultLocale() override;
blink::WebThemeEngine* ThemeEngine() override;
void GetPluginList(bool refresh,
@ -388,7 +388,7 @@ index 74a031ad10c3..3b3f9e292f4b 100644
virtual void FocusedNodeChanged(const blink::WebNode& node) {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 3c94a2dd53f6..99be46fdbfd3 100644
index 165f418781cb..85a28a9faf12 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3278,7 +3278,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@ -411,10 +411,10 @@ index 3c94a2dd53f6..99be46fdbfd3 100644
void RenderFrameImpl::WillCommitProvisionalLoad() {
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 672cde1a8ac0..df37f689bed7 100644
index 02c3aa656b66..c993780d2539 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -899,6 +899,8 @@ void RenderThreadImpl::Init(
@@ -900,6 +900,8 @@ void RenderThreadImpl::Init(
StartServiceManagerConnection();
@ -424,10 +424,10 @@ index 672cde1a8ac0..df37f689bed7 100644
base::Bind(&RenderThreadImpl::OnRendererInterfaceRequest,
base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 52e73b6bccea..f90f531792ab 100644
index 51e1bd539972..74e1b81b1955 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -836,6 +836,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor(
@@ -788,6 +788,7 @@ RendererBlinkPlatformImpl::CreateMIDIAccessor(
void RendererBlinkPlatformImpl::GetPluginList(
bool refresh,
@ -435,7 +435,7 @@ index 52e73b6bccea..f90f531792ab 100644
const blink::WebSecurityOrigin& mainFrameOrigin,
blink::WebPluginListBuilder* builder) {
#if BUILDFLAG(ENABLE_PLUGINS)
@@ -843,7 +844,8 @@ void RendererBlinkPlatformImpl::GetPluginList(
@@ -795,7 +796,8 @@ void RendererBlinkPlatformImpl::GetPluginList(
if (!plugin_refresh_allowed_)
refresh = false;
RenderThread::Get()->Send(
@ -445,7 +445,7 @@ index 52e73b6bccea..f90f531792ab 100644
for (const WebPluginInfo& plugin : plugins) {
builder->AddPlugin(WebString::FromUTF16(plugin.name),
WebString::FromUTF16(plugin.desc),
@@ -1385,6 +1387,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
@@ -1329,6 +1331,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() {
base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory();
}
@ -461,10 +461,10 @@ index 52e73b6bccea..f90f531792ab 100644
if (!web_database_host_) {
web_database_host_ = blink::mojom::ThreadSafeWebDatabaseHostPtr::Create(
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index cd5a9622c99c..a3f79ae5804b 100644
index 43df1974aee9..22e5bcae18a2 100644
--- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h
@@ -126,6 +126,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -124,6 +124,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
viz::FrameSinkId GenerateFrameSinkId() override;
void GetPluginList(bool refresh,
@ -472,7 +472,7 @@ index cd5a9622c99c..a3f79ae5804b 100644
const blink::WebSecurityOrigin& mainFrameOrigin,
blink::WebPluginListBuilder* builder) override;
blink::WebPublicSuffixList* PublicSuffixList() override;
@@ -251,6 +252,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -247,6 +248,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
mojo::ScopedDataPipeConsumerHandle handle) override;
void RequestPurgeMemory() override;
@ -531,10 +531,10 @@ index 84bed37848d9..1a66c0757437 100644
const std::string& mime_type,
bool allow_wildcard,
diff --git content/test/test_blink_web_unit_test_support.cc content/test/test_blink_web_unit_test_support.cc
index 4c0203d05655..ba35ffb1a3b2 100644
index a681ff9fe740..9cec8e2f19cd 100644
--- content/test/test_blink_web_unit_test_support.cc
+++ content/test/test_blink_web_unit_test_support.cc
@@ -316,6 +316,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() {
@@ -310,6 +310,7 @@ blink::WebThread* TestBlinkWebUnitTestSupport::CurrentThread() {
void TestBlinkWebUnitTestSupport::GetPluginList(
bool refresh,
@ -543,10 +543,10 @@ index 4c0203d05655..ba35ffb1a3b2 100644
blink::WebPluginListBuilder* builder) {
builder->AddPlugin("pdf", "pdf", "pdf-files", SkColorSetRGB(38, 38, 38));
diff --git content/test/test_blink_web_unit_test_support.h content/test/test_blink_web_unit_test_support.h
index c3dd2efd9318..9866732b1ebd 100644
index 869f24db0169..d35ca78e1fad 100644
--- content/test/test_blink_web_unit_test_support.h
+++ content/test/test_blink_web_unit_test_support.h
@@ -65,6 +65,7 @@ class TestBlinkWebUnitTestSupport : public BlinkPlatformImpl {
@@ -63,6 +63,7 @@ class TestBlinkWebUnitTestSupport : public BlinkPlatformImpl {
blink::WebThread* CurrentThread() override;
void GetPluginList(bool refresh,

10
patch/patches/crashpad_1995.patch
View File

@ -127,7 +127,7 @@ index fdc51ab22807..cb0a99dd190c 100644
g_crash_helper_enabled = true;
return true;
diff --git components/crash/content/app/breakpad_linux.cc components/crash/content/app/breakpad_linux.cc
index 1dde47fb6bba..8b96a022abf0 100644
index 87703f9a5276..a651ed2b1833 100644
--- components/crash/content/app/breakpad_linux.cc
+++ components/crash/content/app/breakpad_linux.cc
@@ -28,6 +28,7 @@
@ -155,7 +155,7 @@ index 1dde47fb6bba..8b96a022abf0 100644
info.process_start_time = g_process_start_time;
info.oom_size = base::g_oom_size;
info.pid = g_pid;
@@ -1342,7 +1344,7 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
@@ -1341,7 +1343,7 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
header_content_encoding,
header_content_type,
post_file,
@ -164,7 +164,7 @@ index 1dde47fb6bba..8b96a022abf0 100644
"--timeout=10", // Set a timeout so we don't hang forever.
"--tries=1", // Don't retry if the upload fails.
"-O", // Output reply to the file descriptor path.
@@ -1682,10 +1684,19 @@ void HandleCrashDump(const BreakpadInfo& info) {
@@ -1681,10 +1683,19 @@ void HandleCrashDump(const BreakpadInfo& info) {
GetCrashReporterClient()->GetProductNameAndVersion(&product_name, &version);
writer.AddBoundary();
@ -186,7 +186,7 @@ index 1dde47fb6bba..8b96a022abf0 100644
if (info.pid > 0) {
char pid_value_buf[kUint64StringSize];
uint64_t pid_value_len = my_uint64_len(info.pid);
@@ -1803,10 +1814,20 @@ void HandleCrashDump(const BreakpadInfo& info) {
@@ -1802,10 +1813,20 @@ void HandleCrashDump(const BreakpadInfo& info) {
crash_reporter::internal::TransitionalCrashKeyStorage;
CrashKeyStorage::Iterator crash_key_iterator(*info.crash_keys);
const CrashKeyStorage::Entry* entry;
@ -208,7 +208,7 @@ index 1dde47fb6bba..8b96a022abf0 100644
writer.AddBoundary();
writer.Flush();
}
@@ -2016,6 +2037,17 @@ void SetChannelCrashKey(const std::string& channel) {
@@ -2015,6 +2036,17 @@ void SetChannelCrashKey(const std::string& channel) {
channel_key.Set(channel);
}

4
patch/patches/devtools_product_2300.patch
View File

@ -12,10 +12,10 @@ index cae7c566146e..95b4c23c53c9 100644
version.SetString("V8-Version", V8_VERSION_STRING);
std::string host = info.headers["host"];
diff --git content/public/common/content_client.h content/public/common/content_client.h
index ea3c1ef6bb61..0c7d3199050f 100644
index caf91a31abb9..492d12fbbfda 100644
--- content/public/common/content_client.h
+++ content/public/common/content_client.h
@@ -145,6 +145,10 @@ class CONTENT_EXPORT ContentClient {
@@ -148,6 +148,10 @@ class CONTENT_EXPORT ContentClient {
// Used as part of the user agent string.
virtual std::string GetProduct() const;

16
patch/patches/extensions_1947.patch
View File

@ -27,7 +27,7 @@ index 53c7404ef1f9..ac33df7cfe0e 100644
auto* browser_context = web_contents->GetBrowserContext();
StreamsPrivateAPI* streams_private = GetStreamsPrivateAPI(browser_context);
diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc
index b6fb23189522..ccbf05206387 100644
index d7875ac0c044..d369de7e33f1 100644
--- content/browser/frame_host/render_frame_host_manager.cc
+++ content/browser/frame_host/render_frame_host_manager.cc
@@ -903,10 +903,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
@ -57,7 +57,7 @@ index b6fb23189522..ccbf05206387 100644
// 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
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index c8dcbf0f6daa..19c162f0c76a 100644
index 0a347624dcc5..46a2398b567f 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -366,6 +366,13 @@ class CONTENT_EXPORT ContentBrowserClient {
@ -75,18 +75,18 @@ index c8dcbf0f6daa..19c162f0c76a 100644
// current SiteInstance, if it does not yet have a site.
virtual bool ShouldAssignSiteForURL(const GURL& url);
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index a5a821840124..a2a8a0d63272 100644
index 294243d2e7de..867bbf9ac3a2 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -68,11 +68,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
DCHECK(host_type == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE ||
host_type == VIEW_TYPE_EXTENSION_DIALOG ||
host_type == VIEW_TYPE_EXTENSION_POPUP);
- host_contents_.reset(WebContents::Create(
- WebContents::CreateParams(browser_context_, site_instance))),
- host_contents_ = WebContents::Create(
- WebContents::CreateParams(browser_context_, site_instance)),
- content::WebContentsObserver::Observe(host_contents_.get());
+ host_contents_owned_.reset(WebContents::Create(
+ WebContents::CreateParams(browser_context_, site_instance)));
+ host_contents_owned_ = WebContents::Create(
+ WebContents::CreateParams(browser_context_, site_instance));
+ host_contents_ = host_contents_owned_.get();
+ content::WebContentsObserver::Observe(host_contents_);
host_contents_->SetDelegate(this);
@ -145,7 +145,7 @@ index a5a821840124..a2a8a0d63272 100644
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
index c93e3a48c7ee..ff6e2dbbca56 100644
index 8c7a96fdc179..6462365b24f2 100644
--- extensions/browser/extension_host.h
+++ extensions/browser/extension_host.h
@@ -51,13 +51,19 @@ class ExtensionHost : public DeferredStartRenderHost,

4
patch/patches/gn_config.patch
View File

@ -12,10 +12,10 @@ index 36b54aca866c..06337f3f3086 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index ff2f6ff45105..562bea65a4a6 100644
index 1ffcbba9a38d..e8863b981e8d 100644
--- BUILD.gn
+++ BUILD.gn
@@ -191,6 +191,7 @@ group("gn_all") {
@@ -192,6 +192,7 @@ group("gn_all") {
if (!is_ios && !is_fuchsia) {
deps += [

4
patch/patches/linux_build.patch
View File

@ -1,8 +1,8 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index 3dbf872f7038..8bcebb8ea85e 100644
index bb13f93c0277..52e610d0a28a 100644
--- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn
@@ -149,7 +149,7 @@ declare_args() {
@@ -153,7 +153,7 @@ declare_args() {
!(is_android && use_order_profiling) &&
((use_lld && !is_nacl) ||
(use_gold &&

4
patch/patches/message_loop_443_1992243003.patch
View File

@ -1,5 +1,5 @@
diff --git base/message_loop/message_loop_current.h base/message_loop/message_loop_current.h
index 72b0d8c6fe8c..f5df6369f269 100644
index cf30bae0b202..009574ff488b 100644
--- base/message_loop/message_loop_current.h
+++ base/message_loop/message_loop_current.h
@@ -126,6 +126,16 @@ class BASE_EXPORT MessageLoopCurrent {
@ -19,7 +19,7 @@ index 72b0d8c6fe8c..f5df6369f269 100644
// Enables or disables the recursive task processing. This happens in the case
// of recursive message loops. Some unwanted message loops may occur when
// using common controls or printer functions. By default, recursive task
@@ -199,6 +209,13 @@ class BASE_EXPORT MessageLoopCurrent {
@@ -194,6 +204,13 @@ class BASE_EXPORT MessageLoopCurrent {
explicit MessageLoopCurrent(MessageLoop* current) : current_(current) {}
MessageLoop* const current_;

8
patch/patches/pdfium_print_549365.patch
View File

@ -1,8 +1,8 @@
diff --git BUILD.gn BUILD.gn
index 8107454ec..4792aca8e 100644
index 19e85f99d..ed2da7390 100644
--- BUILD.gn
+++ BUILD.gn
@@ -241,6 +241,10 @@ jumbo_static_library("pdfium") {
@@ -242,6 +242,10 @@ jumbo_static_library("pdfium") {
complete_static_lib = true
configs -= [ "//build/config/compiler:thin_archive" ]
}
@ -14,7 +14,7 @@ index 8107454ec..4792aca8e 100644
jumbo_static_library("test_support") {
diff --git fpdfsdk/fpdf_view.cpp fpdfsdk/fpdf_view.cpp
index d21448bc5..5df0cfeb4 100644
index 0015716d9..afb269a64 100644
--- fpdfsdk/fpdf_view.cpp
+++ fpdfsdk/fpdf_view.cpp
@@ -36,6 +36,7 @@
@ -25,7 +25,7 @@ index d21448bc5..5df0cfeb4 100644
#include "fxjs/ijs_runtime.h"
#include "public/fpdf_formfill.h"
#include "third_party/base/ptr_util.h"
@@ -186,6 +187,7 @@ FPDF_EXPORT void FPDF_CALLCONV FPDF_DestroyLibrary() {
@@ -192,6 +193,7 @@ FPDF_EXPORT void FPDF_CALLCONV FPDF_DestroyLibrary() {
CPDF_ModuleMgr::Destroy();
CFX_GEModule::Destroy();

2
patch/patches/prefs_content_1161.patch
View File

@ -35,7 +35,7 @@ index e4fc39c60fd7..f19fccf47261 100644
bool record_whole_document;
SavePreviousDocumentResources save_previous_document_resources;
diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
index 9a38e9ea1d02..c6f84dfb0fce 100644
index c0df4120b0d1..679c8974fc95 100644
--- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc
@@ -1198,6 +1198,7 @@ void RenderViewImpl::ApplyWebPreferencesInternal(

78
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
index 2d2af58936f1..02e1de3220ce 100644
index b6f6dbf2c0c5..82672ca1320e 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -891,6 +891,7 @@ split_static_library("ui") {
@ -116,10 +116,10 @@ index 006966fd1c58..db9cd49af2a4 100644
#endif
diff --git components/printing/common/print_messages.cc components/printing/common/print_messages.cc
index b308dc410ffb..6c92009df454 100644
index f4647d65aeda..1716d5ce956b 100644
--- components/printing/common/print_messages.cc
+++ components/printing/common/print_messages.cc
@@ -148,7 +148,6 @@ PrintMsg_PrintFrame_Params::PrintMsg_PrintFrame_Params() {}
@@ -150,7 +150,6 @@ PrintMsg_PrintFrame_Params::PrintMsg_PrintFrame_Params() {}
PrintMsg_PrintFrame_Params::~PrintMsg_PrintFrame_Params() {}
@ -127,16 +127,16 @@ index b308dc410ffb..6c92009df454 100644
PrintHostMsg_RequestPrintPreview_Params::
PrintHostMsg_RequestPrintPreview_Params()
: is_modifiable(false),
@@ -170,4 +169,3 @@ PrintHostMsg_SetOptionsFromDocument_Params::
@@ -172,4 +171,3 @@ PrintHostMsg_SetOptionsFromDocument_Params::
PrintHostMsg_SetOptionsFromDocument_Params::
~PrintHostMsg_SetOptionsFromDocument_Params() {
}
-#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
diff --git components/printing/common/print_messages.h components/printing/common/print_messages.h
index b9e8aa76fe5a..12e8b30b339d 100644
index cd3fe2986af2..6b377d0ad476 100644
--- components/printing/common/print_messages.h
+++ components/printing/common/print_messages.h
@@ -85,7 +85,6 @@ struct PrintMsg_PrintFrame_Params {
@@ -86,7 +86,6 @@ struct PrintMsg_PrintFrame_Params {
int document_cookie;
};
@ -144,7 +144,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
struct PrintHostMsg_RequestPrintPreview_Params {
PrintHostMsg_RequestPrintPreview_Params();
~PrintHostMsg_RequestPrintPreview_Params();
@@ -104,7 +103,6 @@ struct PrintHostMsg_SetOptionsFromDocument_Params {
@@ -105,7 +104,6 @@ struct PrintHostMsg_SetOptionsFromDocument_Params {
printing::DuplexMode duplex;
printing::PageRanges page_ranges;
};
@ -152,7 +152,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
#endif // INTERNAL_COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_
@@ -198,7 +196,6 @@ IPC_STRUCT_TRAITS_BEGIN(printing::PageRange)
@@ -204,7 +202,6 @@ IPC_STRUCT_TRAITS_BEGIN(printing::PageRange)
IPC_STRUCT_TRAITS_MEMBER(to)
IPC_STRUCT_TRAITS_END()
@ -160,7 +160,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
IPC_STRUCT_TRAITS_BEGIN(PrintHostMsg_RequestPrintPreview_Params)
IPC_STRUCT_TRAITS_MEMBER(is_modifiable)
IPC_STRUCT_TRAITS_MEMBER(webnode_only)
@@ -219,7 +216,6 @@ IPC_STRUCT_TRAITS_BEGIN(PrintHostMsg_SetOptionsFromDocument_Params)
@@ -225,7 +222,6 @@ IPC_STRUCT_TRAITS_BEGIN(PrintHostMsg_SetOptionsFromDocument_Params)
// Specifies page range to be printed.
IPC_STRUCT_TRAITS_MEMBER(page_ranges)
IPC_STRUCT_TRAITS_END()
@ -168,7 +168,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
IPC_STRUCT_TRAITS_BEGIN(printing::PageSizeMargins)
IPC_STRUCT_TRAITS_MEMBER(content_width)
@@ -264,7 +260,6 @@ IPC_STRUCT_BEGIN(PrintHostMsg_DidPrintContent_Params)
@@ -270,7 +266,6 @@ IPC_STRUCT_BEGIN(PrintHostMsg_DidPrintContent_Params)
IPC_STRUCT_MEMBER(printing::ContentToProxyIdMap, subframe_content_info)
IPC_STRUCT_END()
@ -176,7 +176,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
// Parameters to describe a rendered document.
IPC_STRUCT_BEGIN(PrintHostMsg_DidPreviewDocument_Params)
// Document's content including metafile data and subframe info.
@@ -309,7 +304,6 @@ IPC_STRUCT_BEGIN(PrintHostMsg_DidGetPreviewPageCount_Params)
@@ -315,7 +310,6 @@ IPC_STRUCT_BEGIN(PrintHostMsg_DidGetPreviewPageCount_Params)
// The id of the preview request.
IPC_STRUCT_MEMBER(int, preview_request_id)
IPC_STRUCT_END()
@ -184,7 +184,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
// Parameters to describe a rendered page.
IPC_STRUCT_BEGIN(PrintHostMsg_DidPrintDocument_Params)
@@ -345,10 +339,8 @@ IPC_STRUCT_END()
@@ -351,10 +345,8 @@ IPC_STRUCT_END()
// Messages sent from the browser to the renderer.
@ -195,7 +195,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
// Tells the RenderFrame to initiate printing or print preview for a particular
// node, depending on which mode the RenderFrame is in.
@@ -373,13 +365,13 @@ IPC_MESSAGE_ROUTED1(PrintMsg_PrintingDone,
@@ -379,13 +371,13 @@ IPC_MESSAGE_ROUTED1(PrintMsg_PrintingDone,
// Tells the RenderFrame whether printing is enabled or not.
IPC_MESSAGE_ROUTED1(PrintMsg_SetPrintingEnabled, bool /* enabled */)
@ -210,7 +210,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
// Tells the RenderFrame that print preview dialog was closed.
IPC_MESSAGE_ROUTED0(PrintMsg_ClosePrintPreviewDialog)
#endif
@@ -445,7 +437,6 @@ IPC_MESSAGE_CONTROL3(PrintHostMsg_TempFileForPrintingWritten,
@@ -451,7 +443,6 @@ IPC_MESSAGE_CONTROL3(PrintHostMsg_TempFileForPrintingWritten,
int /* page count */)
#endif // defined(OS_ANDROID)
@ -218,7 +218,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
// Asks the browser to do print preview.
IPC_MESSAGE_ROUTED1(PrintHostMsg_RequestPrintPreview,
PrintHostMsg_RequestPrintPreview_Params /* params */)
@@ -479,7 +470,6 @@ IPC_SYNC_MESSAGE_ROUTED2_1(PrintHostMsg_CheckForCancel,
@@ -485,7 +476,6 @@ IPC_SYNC_MESSAGE_ROUTED2_1(PrintHostMsg_CheckForCancel,
// The memory handle in this message is already valid in the browser process.
IPC_MESSAGE_ROUTED1(PrintHostMsg_MetafileReadyForPrinting,
PrintHostMsg_DidPreviewDocument_Params /* params */)
@ -226,7 +226,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
// This is sent when there are invalid printer settings.
IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError)
@@ -488,7 +478,6 @@ IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError)
@@ -494,7 +484,6 @@ IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError)
IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintingFailed,
int /* document cookie */)
@ -234,7 +234,7 @@ index b9e8aa76fe5a..12e8b30b339d 100644
// Tell the browser print preview failed.
IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintPreviewFailed,
int /* document cookie */)
@@ -515,6 +504,5 @@ IPC_MESSAGE_ROUTED1(PrintHostMsg_ShowScriptedPrintPreview,
@@ -521,6 +510,5 @@ IPC_MESSAGE_ROUTED1(PrintHostMsg_ShowScriptedPrintPreview,
// Notify the browser to set print presets based on source PDF document.
IPC_MESSAGE_ROUTED1(PrintHostMsg_SetOptionsFromDocument,
PrintHostMsg_SetOptionsFromDocument_Params /* params */)
@ -242,10 +242,10 @@ index b9e8aa76fe5a..12e8b30b339d 100644
#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
index d73427c00ea9..2190fca8edcf 100644
index 633afea83efa..e223a05baaad 100644
--- components/printing/renderer/print_render_frame_helper.cc
+++ components/printing/renderer/print_render_frame_helper.cc
@@ -326,7 +326,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
@@ -329,7 +329,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
return plugin && plugin->SupportsPaginatedPrint();
}
@ -253,7 +253,7 @@ index d73427c00ea9..2190fca8edcf 100644
// Returns true if the current destination printer is PRINT_TO_PDF.
bool IsPrintToPdfRequested(const base::DictionaryValue& job_settings) {
bool print_to_pdf = false;
@@ -348,7 +347,6 @@ bool PrintingFrameHasPageSizeStyle(blink::WebLocalFrame* frame,
@@ -351,7 +350,6 @@ bool PrintingFrameHasPageSizeStyle(blink::WebLocalFrame* frame,
}
return frame_has_custom_page_size_style;
}
@ -261,7 +261,7 @@ index d73427c00ea9..2190fca8edcf 100644
#if BUILDFLAG(ENABLE_PRINTING)
// Disable scaling when either:
@@ -403,7 +401,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame,
@@ -406,7 +404,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame,
: PRINTABLE_AREA_MARGINS;
}
@ -269,7 +269,7 @@ index d73427c00ea9..2190fca8edcf 100644
bool FitToPageEnabled(const base::DictionaryValue& job_settings) {
bool fit_to_paper_size = false;
if (!job_settings.GetBoolean(kSettingFitToPageEnabled, &fit_to_paper_size)) {
@@ -445,7 +442,6 @@ blink::WebPrintScalingOption GetPrintScalingOption(
@@ -448,7 +445,6 @@ blink::WebPrintScalingOption GetPrintScalingOption(
}
return blink::kWebPrintScalingOptionFitToPrintableArea;
}
@ -277,7 +277,7 @@ index d73427c00ea9..2190fca8edcf 100644
// Helper function to scale and round an integer value with a double valued
// scaling.
@@ -949,6 +945,7 @@ PrintRenderFrameHelper::PrintRenderFrameHelper(
@@ -952,6 +948,7 @@ PrintRenderFrameHelper::PrintRenderFrameHelper(
notify_browser_of_print_failure_(true),
delegate_(std::move(delegate)),
print_node_in_progress_(false),
@ -285,7 +285,7 @@ index d73427c00ea9..2190fca8edcf 100644
is_loading_(false),
is_scripted_preview_delayed_(false),
ipc_nesting_level_(0),
@@ -1010,10 +1007,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -1013,10 +1010,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
return;
if (g_is_preview_enabled) {
@ -296,7 +296,7 @@ index d73427c00ea9..2190fca8edcf 100644
} else {
auto weak_this = weak_ptr_factory_.GetWeakPtr();
web_frame->DispatchBeforePrintEvent();
@@ -1041,10 +1036,10 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) {
@@ -1044,10 +1039,10 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) {
IPC_BEGIN_MESSAGE_MAP(PrintRenderFrameHelper, message)
IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages)
IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog)
@ -308,7 +308,7 @@ index d73427c00ea9..2190fca8edcf 100644
IPC_MESSAGE_HANDLER(PrintMsg_ClosePrintPreviewDialog,
OnClosePrintPreviewDialog)
#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -1126,7 +1121,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo(
@@ -1129,7 +1124,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo(
ignore_css_margins_ = (margins_type != DEFAULT_MARGINS);
}
@ -316,7 +316,7 @@ index d73427c00ea9..2190fca8edcf 100644
void PrintRenderFrameHelper::OnPrintPreview(
const base::DictionaryValue& settings) {
if (ipc_nesting_level_ > 1)
@@ -1311,7 +1305,6 @@ bool PrintRenderFrameHelper::CreatePreviewDocument() {
@@ -1314,7 +1308,6 @@ bool PrintRenderFrameHelper::CreatePreviewDocument() {
return true;
}
@ -324,7 +324,7 @@ index d73427c00ea9..2190fca8edcf 100644
bool PrintRenderFrameHelper::RenderPreviewPage(
int page_number,
const PrintMsg_Print_Params& print_params) {
@@ -1339,7 +1332,6 @@ bool PrintRenderFrameHelper::RenderPreviewPage(
@@ -1342,7 +1335,6 @@ bool PrintRenderFrameHelper::RenderPreviewPage(
print_params.printed_doc_type);
return PreviewPageRendered(page_number, std::move(metafile));
}
@ -332,7 +332,7 @@ index d73427c00ea9..2190fca8edcf 100644
bool PrintRenderFrameHelper::FinalizePrintReadyDocument() {
DCHECK(!is_print_ready_metafile_sent_);
@@ -1367,7 +1359,6 @@ bool PrintRenderFrameHelper::FinalizePrintReadyDocument() {
@@ -1370,7 +1362,6 @@ bool PrintRenderFrameHelper::FinalizePrintReadyDocument() {
Send(new PrintHostMsg_MetafileReadyForPrinting(routing_id(), preview_params));
return true;
}
@ -340,7 +340,7 @@ index d73427c00ea9..2190fca8edcf 100644
void PrintRenderFrameHelper::OnPrintingDone(bool success) {
if (ipc_nesting_level_ > 1)
@@ -1382,7 +1373,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) {
@@ -1385,7 +1376,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) {
is_printing_enabled_ = enabled;
}
@ -348,7 +348,7 @@ index d73427c00ea9..2190fca8edcf 100644
void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
if (ipc_nesting_level_ > 1)
return;
@@ -1393,7 +1383,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
@@ -1396,7 +1386,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
// that instead.
auto plugin = delegate_->GetPdfElement(frame);
if (!plugin.IsNull()) {
@ -358,7 +358,7 @@ index d73427c00ea9..2190fca8edcf 100644
return;
}
print_preview_context_.InitWithFrame(frame);
@@ -1402,10 +1394,11 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
@@ -1405,10 +1397,11 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) {
: PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME);
}
@ -371,7 +371,7 @@ index d73427c00ea9..2190fca8edcf 100644
void PrintRenderFrameHelper::OnPrintFrameContent(
const PrintMsg_PrintFrame_Params& params) {
@@ -1489,11 +1482,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -1492,11 +1485,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
print_node_in_progress_ = true;
@ -384,7 +384,7 @@ index d73427c00ea9..2190fca8edcf 100644
} else {
// Make a copy of the node, in case RenderView::OnContextMenuClosed() resets
// its |context_menu_node_|.
@@ -1583,7 +1574,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
@@ -1586,7 +1577,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
}
break;
@ -392,7 +392,7 @@ index d73427c00ea9..2190fca8edcf 100644
case FAIL_PREVIEW:
if (!is_print_ready_metafile_sent_) {
if (notify_browser_of_print_failure_) {
@@ -1600,7 +1590,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
@@ -1603,7 +1593,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) {
cookie));
print_preview_context_.Failed(false);
break;
@ -400,7 +400,7 @@ index d73427c00ea9..2190fca8edcf 100644
}
prep_frame_view_.reset();
print_pages_params_.reset();
@@ -1768,7 +1757,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
@@ -1771,7 +1760,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
return true;
}
@ -408,7 +408,7 @@ index d73427c00ea9..2190fca8edcf 100644
bool PrintRenderFrameHelper::SetOptionsFromPdfDocument(
PrintHostMsg_SetOptionsFromDocument_Params* options) {
blink::WebLocalFrame* source_frame = print_preview_context_.source_frame();
@@ -1862,7 +1850,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings(
@@ -1865,7 +1853,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings(
print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS);
return false;
}
@ -416,7 +416,7 @@ index d73427c00ea9..2190fca8edcf 100644
void PrintRenderFrameHelper::GetPrintSettingsFromUser(
blink::WebLocalFrame* frame,
@@ -2018,7 +2005,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
@@ -2021,7 +2008,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem(
return true;
}
@ -424,7 +424,7 @@ index d73427c00ea9..2190fca8edcf 100644
void PrintRenderFrameHelper::ShowScriptedPrintPreview() {
if (is_scripted_preview_delayed_) {
is_scripted_preview_delayed_ = false;
@@ -2141,7 +2127,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
@@ -2144,7 +2130,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(
Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params));
return true;
}

2
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
index ec3c8adcdea4..72bd8e7cc871 100644
index 01db5dbf533b..b70659867710 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -741,9 +741,11 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(

109
patch/patches/storage_partition_1973.patch
View File

@ -28,7 +28,7 @@ index 596cfaa01092..f341bca174d5 100644
origin, std::move(request)));
}
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
index 0b5780dfe117..a499aaacb879 100644
index 89f917826da1..d102ad69f084 100644
--- content/browser/blob_storage/chrome_blob_storage_context.cc
+++ content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -87,6 +87,11 @@ class BlobHandleImpl : public BlobHandle {
@ -44,10 +44,10 @@ index 0b5780dfe117..a499aaacb879 100644
BrowserContext* context) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
diff --git content/browser/blob_storage/chrome_blob_storage_context.h content/browser/blob_storage/chrome_blob_storage_context.h
index 043d968ca6ab..edb3c0d80c12 100644
index 812a6a5cebe8..e6ee7ffbba79 100644
--- content/browser/blob_storage/chrome_blob_storage_context.h
+++ content/browser/blob_storage/chrome_blob_storage_context.h
@@ -52,6 +52,8 @@ class CONTENT_EXPORT ChromeBlobStorageContext
@@ -50,6 +50,8 @@ class CONTENT_EXPORT ChromeBlobStorageContext
public:
ChromeBlobStorageContext();
@ -73,7 +73,7 @@ index cda94e43e866..84fde20fdce2 100644
partition->GetBluetoothAllowedDevicesMap();
return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin());
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index bb3d7a1f7b65..a44b32c618c0 100644
index af7cced24feb..6a228c204912 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -131,11 +131,18 @@ StoragePartition* GetStoragePartitionFromConfig(
@ -98,7 +98,7 @@ index bb3d7a1f7b65..a44b32c618c0 100644
}
void SaveSessionStateOnIOThread(
@@ -586,6 +593,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
@@ -566,6 +573,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor(
BrowserContext::BrowserContext()
: unique_id_(base::UnguessableToken::Create().ToString()) {}
@ -111,7 +111,7 @@ index bb3d7a1f7b65..a44b32c618c0 100644
CHECK(GetUserData(kMojoWasInitialized))
<< "Attempting to destroy a BrowserContext that never called "
diff --git content/browser/devtools/protocol/network_handler.cc content/browser/devtools/protocol/network_handler.cc
index a438c95df957..b80ea1582ec3 100644
index 4fa1766cf313..7f539e1e83a3 100644
--- content/browser/devtools/protocol/network_handler.cc
+++ content/browser/devtools/protocol/network_handler.cc
@@ -889,8 +889,7 @@ class BackgroundSyncRestorer {
@ -161,10 +161,10 @@ index ec9ab86d0ca6..0fe5219f1e84 100644
base::WeakPtrFactory<ServiceWorkerHandler> weak_factory_;
diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc
index 73135a675b85..4e1b9854ad9d 100644
index 591f60dc8f96..ad90a2648e23 100644
--- content/browser/download/download_manager_impl.cc
+++ content/browser/download/download_manager_impl.cc
@@ -84,9 +84,9 @@
@@ -85,9 +85,9 @@
namespace content {
namespace {
@ -177,7 +177,7 @@ index 73135a675b85..4e1b9854ad9d 100644
DCHECK_CURRENTLY_ON(BrowserThread::UI);
SiteInstance* site_instance = nullptr;
@@ -96,8 +96,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
@@ -97,8 +97,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context,
if (render_frame_host_)
site_instance = render_frame_host_->GetSiteInstance();
}
@ -187,7 +187,7 @@ index 73135a675b85..4e1b9854ad9d 100644
}
bool CanRequestURLFromRenderer(int render_process_id, GURL url) {
@@ -250,7 +249,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
@@ -251,7 +250,7 @@ base::FilePath GetTemporaryDownloadDirectory() {
#endif
scoped_refptr<download::DownloadURLLoaderFactoryGetter>
@ -196,7 +196,7 @@ index 73135a675b85..4e1b9854ad9d 100644
RenderFrameHost* rfh,
bool has_suggested_filename) {
network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info;
@@ -267,7 +266,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
@@ -268,7 +267,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition,
}
}
return base::MakeRefCounted<NetworkDownloadURLLoaderFactoryGetter>(
@ -205,7 +205,7 @@ index 73135a675b85..4e1b9854ad9d 100644
std::move(proxy_factory_ptr_info), std::move(proxy_factory_request));
}
@@ -597,8 +596,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
@@ -598,8 +597,8 @@ void DownloadManagerImpl::ResumeInterruptedDownload(
std::unique_ptr<download::DownloadUrlParameters> params,
uint32_t id,
const GURL& site_url) {
@ -215,8 +215,8 @@ index 73135a675b85..4e1b9854ad9d 100644
+ BrowserContext::GetStoragePartitionForSite(browser_context_, site_url);
params->set_url_request_context_getter(
storage_partition->GetURLRequestContext());
BeginDownloadInternal(std::move(params), nullptr, id, storage_partition);
@@ -784,7 +783,7 @@ void DownloadManagerImpl::DownloadUrl(
BeginDownloadInternal(std::move(params), nullptr /* blob_data_handle */,
@@ -789,7 +788,7 @@ void DownloadManagerImpl::DownloadUrl(
download::RecordDownloadCountWithSource(
download::DownloadCountTypes::DOWNLOAD_TRIGGERED_COUNT,
params->download_source());
@ -225,7 +225,7 @@ index 73135a675b85..4e1b9854ad9d 100644
GetStoragePartition(browser_context_, params->render_process_host_id(),
params->render_frame_host_routing_id());
BeginDownloadInternal(std::move(params), std::move(blob_data_handle),
@@ -1002,7 +1001,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
@@ -1008,7 +1007,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
tab_referrer_url = entry->GetReferrer().url;
}
}
@ -234,9 +234,9 @@ index 73135a675b85..4e1b9854ad9d 100644
GetStoragePartition(browser_context_, render_process_id, render_frame_id);
in_progress_manager_->InterceptDownloadFromNavigation(
std::move(resource_request), render_process_id, render_frame_id, site_url,
@@ -1017,7 +1016,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
std::unique_ptr<download::DownloadUrlParameters> params,
@@ -1024,7 +1023,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory,
uint32_t id,
- StoragePartitionImpl* storage_partition) {
+ StoragePartition* storage_partition) {
@ -244,7 +244,7 @@ index 73135a675b85..4e1b9854ad9d 100644
if (params->render_process_host_id() >= 0 &&
!CanRequestURLFromRenderer(params->render_process_host_id(),
diff --git content/browser/download/download_manager_impl.h content/browser/download/download_manager_impl.h
index e7aa6cefb35c..42c2090ca161 100644
index f79ea7165dfd..35b545213c31 100644
--- content/browser/download/download_manager_impl.h
+++ content/browser/download/download_manager_impl.h
@@ -42,7 +42,7 @@ class DownloadRequestHandleInterface;
@ -256,9 +256,9 @@ index e7aa6cefb35c..42c2090ca161 100644
class CONTENT_EXPORT DownloadManagerImpl
: public DownloadManager,
@@ -246,7 +246,7 @@ class CONTENT_EXPORT DownloadManagerImpl
std::unique_ptr<download::DownloadUrlParameters> params,
@@ -248,7 +248,7 @@ class CONTENT_EXPORT DownloadManagerImpl
std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory,
uint32_t id,
- StoragePartitionImpl* storage_partition);
+ StoragePartition* storage_partition);
@ -266,10 +266,10 @@ index e7aa6cefb35c..42c2090ca161 100644
void InterceptNavigationOnChecksComplete(
ResourceRequestInfo::WebContentsGetter web_contents_getter,
diff --git content/browser/loader/navigation_url_loader_network_service.cc content/browser/loader/navigation_url_loader_network_service.cc
index b4c1232ea111..f44572270b83 100644
index 955cb24e64d1..1c2abdf645dc 100644
--- content/browser/loader/navigation_url_loader_network_service.cc
+++ content/browser/loader/navigation_url_loader_network_service.cc
@@ -893,7 +893,7 @@ class NavigationURLLoaderNetworkService::URLLoaderRequestController
@@ -892,7 +892,7 @@ class NavigationURLLoaderNetworkService::URLLoaderRequestController
// path does as well for navigations.
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
-1 /* render_process_id */, -1 /* render_frame_id */, resource_context_,
@ -278,7 +278,7 @@ index b4c1232ea111..f44572270b83 100644
false /* allow_wildcard */, &stale, &plugin, nullptr);
if (stale) {
@@ -1260,7 +1260,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
@@ -1259,7 +1259,7 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
}
}
@ -287,7 +287,7 @@ index b4c1232ea111..f44572270b83 100644
non_network_url_loader_factories_[url::kFileScheme] =
std::make_unique<FileURLLoaderFactory>(
partition->browser_context()->GetPath(),
@@ -1274,7 +1274,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
@@ -1273,7 +1273,8 @@ NavigationURLLoaderNetworkService::NavigationURLLoaderNetworkService(
DCHECK(!request_controller_);
request_controller_ = std::make_unique<URLLoaderRequestController>(
std::move(initial_interceptors), std::move(new_request), resource_context,
@ -314,10 +314,10 @@ index 6a6e31bdb070..dce0433e1775 100644
partition->GetPaymentAppContext();
diff --git content/browser/payments/payment_app_provider_impl.cc content/browser/payments/payment_app_provider_impl.cc
index 5d4aefd16449..b5f99bc43389 100644
index dd0af046aec4..f5ad5b37c1f3 100644
--- content/browser/payments/payment_app_provider_impl.cc
+++ content/browser/payments/payment_app_provider_impl.cc
@@ -307,10 +307,11 @@ void StartServiceWorkerForDispatch(BrowserContext* browser_context,
@@ -371,10 +371,11 @@ void StartServiceWorkerForDispatch(BrowserContext* browser_context,
ServiceWorkerStartCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@ -332,7 +332,7 @@ index 5d4aefd16449..b5f99bc43389 100644
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
@@ -377,8 +378,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
@@ -451,8 +452,8 @@ void PaymentAppProviderImpl::GetAllPaymentApps(
GetAllPaymentAppsCallback callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@ -344,10 +344,10 @@ index 5d4aefd16449..b5f99bc43389 100644
partition->GetPaymentAppContext();
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index a0162dcd2946..eef13b5035e9 100644
index 20994fc0a49c..f2f79f299d20 100644
--- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -734,11 +734,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -732,11 +732,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
// Gets the correct render process to use for this SiteInstance.
RenderProcessHost* GetProcessHost(SiteInstance* site_instance,
bool is_for_guests_only) {
@ -363,7 +363,7 @@ index a0162dcd2946..eef13b5035e9 100644
// Is this the default storage partition? If it isn't, then just give it its
// own non-shared process.
@@ -1351,7 +1350,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
@@ -1349,7 +1348,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() {
// static
RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
BrowserContext* browser_context,
@ -372,7 +372,7 @@ index a0162dcd2946..eef13b5035e9 100644
SiteInstance* site_instance,
bool is_for_guests_only) {
if (g_render_process_host_factory_) {
@@ -1360,8 +1359,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
@@ -1358,8 +1357,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost(
}
if (!storage_partition_impl) {
@ -383,7 +383,7 @@ index a0162dcd2946..eef13b5035e9 100644
}
// If we've made a StoragePartition for guests (e.g., for the <webview> tag),
// stash the Site URL on it. This way, when we start a service worker inside
@@ -1386,7 +1385,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
@@ -1384,7 +1383,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority =
RenderProcessHostImpl::RenderProcessHostImpl(
BrowserContext* browser_context,
@ -392,7 +392,7 @@ index a0162dcd2946..eef13b5035e9 100644
bool is_for_guests_only)
: fast_shutdown_started_(false),
deleting_soon_(false),
@@ -1419,7 +1418,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1417,7 +1416,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
indexed_db_factory_(new IndexedDBDispatcherHost(
id_,
storage_partition_impl_->GetURLRequestContext(),
@ -402,7 +402,7 @@ index a0162dcd2946..eef13b5035e9 100644
ChromeBlobStorageContext::GetFor(browser_context_))),
channel_connected_(false),
sent_render_process_ready_(false),
@@ -1454,7 +1454,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
@@ -1452,7 +1452,8 @@ RenderProcessHostImpl::RenderProcessHostImpl(
}
push_messaging_manager_.reset(new PushMessagingManager(
@ -412,7 +412,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddObserver(indexed_db_factory_.get());
#if defined(OS_MACOSX)
@@ -1782,6 +1783,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
@@ -1780,6 +1781,20 @@ void RenderProcessHostImpl::ResetChannelProxy() {
void RenderProcessHostImpl::CreateMessageFilters() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@ -433,7 +433,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddFilter(new ResourceSchedulerFilter(GetID()));
MediaInternals* media_internals = MediaInternals::GetInstance();
// Add BrowserPluginMessageFilter to ensure it gets the first stab at messages
@@ -1795,8 +1810,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1793,8 +1808,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
new RenderMessageFilter(
GetID(), GetBrowserContext(), request_context.get(),
widget_helper_.get(), media_internals,
@ -444,7 +444,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddFilter(render_message_filter.get());
render_frame_message_filter_ = new RenderFrameMessageFilter(
@@ -1823,10 +1838,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1821,10 +1836,10 @@ void RenderProcessHostImpl::CreateMessageFilters() {
ChromeBlobStorageContext::GetFor(browser_context);
resource_message_filter_ = new ResourceMessageFilter(
@ -457,7 +457,7 @@ index a0162dcd2946..eef13b5035e9 100644
storage_partition_impl_->GetPrefetchURLLoaderService(),
std::move(get_contexts_callback),
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
@@ -1835,8 +1850,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1833,8 +1848,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(
new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service()));
@ -467,7 +467,7 @@ index a0162dcd2946..eef13b5035e9 100644
#if BUILDFLAG(ENABLE_WEBRTC)
peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID());
@@ -1858,8 +1872,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1854,8 +1868,7 @@ void RenderProcessHostImpl::CreateMessageFilters() {
scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
new ServiceWorkerDispatcherHost(GetID(), resource_context);
@ -477,7 +477,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddFilter(service_worker_filter.get());
#if BUILDFLAG(ENABLE_WEBRTC)
@@ -1871,11 +1884,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
@@ -1867,11 +1880,8 @@ void RenderProcessHostImpl::CreateMessageFilters() {
AddFilter(new TraceMessageFilter(GetID()));
AddFilter(new ResolveProxyMsgHelper(request_context.get()));
@ -490,7 +490,7 @@ index a0162dcd2946..eef13b5035e9 100644
resource_context, service_worker_context, browser_context);
AddFilter(notification_message_filter_.get());
}
@@ -1889,7 +1899,8 @@ void RenderProcessHostImpl::BindCacheStorage(
@@ -1885,7 +1895,8 @@ void RenderProcessHostImpl::BindCacheStorage(
cache_storage_dispatcher_host_ =
base::MakeRefCounted<CacheStorageDispatcherHost>();
cache_storage_dispatcher_host_->Init(
@ -500,7 +500,7 @@ index a0162dcd2946..eef13b5035e9 100644
}
// Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO
// thread entirely.
@@ -2022,7 +2033,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
@@ -2018,7 +2029,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
registry->AddInterface(base::BindRepeating(
&AppCacheDispatcherHost::Create,
@ -511,7 +511,7 @@ index a0162dcd2946..eef13b5035e9 100644
AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create));
diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h
index 4a9513bfa37c..23639d2bbf2b 100644
index e709fd121d7c..b67e0d854e07 100644
--- content/browser/renderer_host/render_process_host_impl.h
+++ content/browser/renderer_host/render_process_host_impl.h
@@ -88,7 +88,6 @@ class ResourceMessageFilter;
@ -531,7 +531,7 @@ index 4a9513bfa37c..23639d2bbf2b 100644
SiteInstance* site_instance,
bool is_for_guests_only);
@@ -446,7 +445,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -445,7 +444,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Use CreateRenderProcessHost() instead of calling this constructor
// directly.
RenderProcessHostImpl(BrowserContext* browser_context,
@ -540,7 +540,7 @@ index 4a9513bfa37c..23639d2bbf2b 100644
bool is_for_guests_only);
// Initializes a new IPC::ChannelProxy in |channel_|, which will be connected
@@ -717,10 +716,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
@@ -716,10 +715,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
// called.
int instance_id_ = 1;
@ -554,10 +554,10 @@ index 4a9513bfa37c..23639d2bbf2b 100644
// The observers watching our lifetime.
base::ObserverList<RenderProcessHostObserver> observers_;
diff --git content/browser/renderer_interface_binders.cc content/browser/renderer_interface_binders.cc
index 81e1e824d0f2..4a1c11c597d9 100644
index 74a060efdc5c..548feab31a42 100644
--- content/browser/renderer_interface_binders.cc
+++ content/browser/renderer_interface_binders.cc
@@ -135,7 +135,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -143,7 +143,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(
base::Bind([](payments::mojom::PaymentManagerRequest request,
RenderProcessHost* host, const url::Origin& origin) {
@ -566,7 +566,7 @@ index 81e1e824d0f2..4a1c11c597d9 100644
->GetPaymentAppContext()
->CreatePaymentManager(std::move(request));
}));
@@ -155,7 +155,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -163,16 +163,17 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(base::BindRepeating(
[](blink::mojom::LockManagerRequest request, RenderProcessHost* host,
const url::Origin& origin) {
@ -575,7 +575,6 @@ index 81e1e824d0f2..4a1c11c597d9 100644
->GetLockManager()
->CreateService(std::move(request), origin);
}));
@@ -164,9 +164,10 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
parameterized_binder_registry_.AddInterface(
base::Bind([](blink::mojom::NotificationServiceRequest request,
RenderProcessHost* host, const url::Origin& origin) {
@ -721,10 +720,10 @@ index 075ae3e7431e..57fb5fd2c4a8 100644
void InitializeOnIOThread();
diff --git content/browser/webui/web_ui_url_loader_factory.cc content/browser/webui/web_ui_url_loader_factory.cc
index fb7a2fe41f94..f8232c08e924 100644
index 187bde2d1cca..b86e9c943f01 100644
--- content/browser/webui/web_ui_url_loader_factory.cc
+++ content/browser/webui/web_ui_url_loader_factory.cc
@@ -19,13 +19,13 @@
@@ -20,13 +20,13 @@
#include "content/browser/frame_host/render_frame_host_impl.h"
#include "content/browser/histogram_internals_url_loader.h"
#include "content/browser/resource_context_impl.h"
@ -739,7 +738,7 @@ index fb7a2fe41f94..f8232c08e924 100644
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/url_constants.h"
@@ -313,9 +313,8 @@ class WebUIURLLoaderFactory : public network::mojom::URLLoaderFactory,
@@ -319,9 +319,8 @@ class WebUIURLLoaderFactory : public network::mojom::URLLoaderFactory,
const std::string& scheme() const { return scheme_; }
private:
@ -752,10 +751,10 @@ index fb7a2fe41f94..f8232c08e924 100644
RenderFrameHost* render_frame_host_;
diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h
index 4df248003ecb..395c670dbd1e 100644
index dffff04f6f86..29a0653b8fa5 100644
--- content/public/browser/browser_context.h
+++ content/public/browser/browser_context.h
@@ -206,6 +206,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -197,6 +197,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
BrowserContext();
@ -764,7 +763,7 @@ index 4df248003ecb..395c670dbd1e 100644
~BrowserContext() override;
// Shuts down the storage partitions associated to this browser context.
@@ -294,6 +296,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
@@ -285,6 +287,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
const base::FilePath& partition_path,
bool in_memory) = 0;

8
patch/patches/views_1749_2102.patch
View File

@ -295,10 +295,10 @@ index 1d35afeda78f..333f9c0f778d 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 46713d7170a6..685b0fb33286 100644
index c1ba25788dd6..8ed6b781e06a 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -2321,8 +2321,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -2315,8 +2315,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item;
@ -313,7 +313,7 @@ index 46713d7170a6..685b0fb33286 100644
MenuItemView* to_select = NULL;
if (item->GetSubmenu()->GetMenuItemCount() > 0)
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2337,8 +2342,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
@@ -2331,8 +2336,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item;
DCHECK(item);
@ -373,7 +373,7 @@ index 4dea63f9f286..ef50b710c5af 100644
virtual int GetMaxWidthForMenu(MenuItemView* menu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index 6aa3bb538539..3bdef6759456 100644
index 5c21e2213bfa..f5a35ea10ed9 100644
--- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc
@@ -842,7 +842,12 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {

20
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index d6e3ba62a9d6..772baa2f5129 100644
index 909cbf39b2e0..f91f652a9d73 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -371,6 +371,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
@@ -376,6 +376,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() const {
return screen_info.device_scale_factor;
}
@ -18,18 +18,18 @@ index d6e3ba62a9d6..772baa2f5129 100644
return renderer_frame_number_;
}
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index 3293d2dd5e6d..3c1bf7a41f07 100644
index 04b50a9fcefb..c0b509f4881f 100644
--- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -80,6 +80,7 @@ class BrowserAccessibilityManager;
class CursorManager;
@@ -81,6 +81,7 @@ class CursorManager;
class MouseWheelPhaseHandler;
class RenderWidgetHostImpl;
class RenderWidgetHostViewBaseObserver;
+class RenderWidgetHostViewGuest;
class SyntheticGestureTarget;
class TextInputManager;
class TouchSelectionControllerClientManager;
@@ -101,6 +102,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -102,6 +103,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
float current_device_scale_factor() const {
return current_device_scale_factor_;
}
@ -39,7 +39,7 @@ index 3293d2dd5e6d..3c1bf7a41f07 100644
// Returns the focused RenderWidgetHost inside this |view|'s RWH.
RenderWidgetHostImpl* GetFocusedWidget() const;
@@ -132,6 +136,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -133,6 +137,8 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
void DisableAutoResize(const gfx::Size& new_size) override;
bool IsScrollOffsetAtTop() const override;
float GetDeviceScaleFactor() const final;
@ -48,7 +48,7 @@ index 3293d2dd5e6d..3c1bf7a41f07 100644
TouchSelectionControllerClientManager*
GetTouchSelectionControllerClientManager() override;
@@ -425,6 +431,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -426,6 +432,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// helps to position the full screen widget on the correct monitor.
virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0;
@ -61,7 +61,7 @@ index 3293d2dd5e6d..3c1bf7a41f07 100644
// Sets the cursor for this view to the one associated with the specified
// cursor_type.
virtual void UpdateCursor(const WebCursor& cursor) = 0;
@@ -595,6 +607,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -600,6 +612,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
bool is_currently_scrolling_viewport_;
@ -194,7 +194,7 @@ index beffc35eee45..0982b021b4e2 100644
// a reference.
corewm::TooltipWin* tooltip_;
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index 3f50f47d64a3..7e5579c96a2c 100644
index 89513b6e40e0..06bb9d0508ab 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -145,6 +145,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(

25
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
index 6e3f8e889e6d..8eecc7fc9692 100644
index 73514cb25175..f21a0b700ac0 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -1779,21 +1779,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1791,21 +1791,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -45,7 +45,7 @@ index 6e3f8e889e6d..8eecc7fc9692 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -2394,6 +2403,15 @@ void WebContentsImpl::CreateNewWindow(
@@ -2410,6 +2419,15 @@ void WebContentsImpl::CreateNewWindow(
create_params.renderer_initiated_creation =
main_frame_route_id != MSG_ROUTING_NONE;
@ -58,10 +58,10 @@ index 6e3f8e889e6d..8eecc7fc9692 100644
+ &create_params.delegate_view);
+ }
+
WebContentsImpl* new_contents = nullptr;
std::unique_ptr<WebContents> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -2423,7 +2441,7 @@ void WebContentsImpl::CreateNewWindow(
@@ -2440,7 +2458,7 @@ void WebContentsImpl::CreateNewWindow(
// 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.
new_view->CreateViewForWidget(
@ -70,7 +70,7 @@ index 6e3f8e889e6d..8eecc7fc9692 100644
}
// Save the created window associated with the route so we can show it
// later.
@@ -5731,7 +5749,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
@@ -5759,7 +5777,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view =
@ -95,10 +95,10 @@ index 53d56abb35a3..d7b955f42ca5 100644
WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index be4048f9963d..df3f9af6dbf3 100644
index b79480f87663..69ef5de880f3 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -70,9 +70,11 @@ class BrowserPluginGuestDelegate;
@@ -74,9 +74,11 @@ class BrowserPluginGuestDelegate;
class InterstitialPage;
class RenderFrameHost;
class RenderViewHost;
@ -109,8 +109,8 @@ index be4048f9963d..df3f9af6dbf3 100644
+class WebContentsView;
struct CustomContextMenuContext;
struct DropData;
struct Manifest;
@@ -175,6 +177,10 @@ class WebContents : public PageNavigator,
struct MHTMLGenerationParams;
@@ -178,6 +180,10 @@ class WebContents : public PageNavigator,
// Sandboxing flags set on the new WebContents.
blink::WebSandboxFlags starting_sandbox_flags;
@ -122,10 +122,10 @@ index be4048f9963d..df3f9af6dbf3 100644
// Creates a new WebContents.
diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
index 28cf408db3b5..5ccc783dd8b9 100644
index d6adf55d3c68..dd260776e01b 100644
--- content/public/browser/web_contents_delegate.h
+++ content/public/browser/web_contents_delegate.h
@@ -45,11 +45,13 @@ class ColorChooser;
@@ -46,10 +46,12 @@ class ColorChooser;
class JavaScriptDialogManager;
class RenderFrameHost;
class RenderProcessHost;
@ -133,7 +133,6 @@ index 28cf408db3b5..5ccc783dd8b9 100644
class RenderWidgetHost;
class SessionStorageNamespace;
class SiteInstance;
class WebContents;
class WebContentsImpl;
+class WebContentsView;
struct ContextMenuParams;

16
patch/patches/webkit_plugin_info_2015.patch
View File

@ -1,8 +1,8 @@
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
index 81c92786c4b3..fedd9f01d05a 100644
index f832a1183d5f..cd52e63ab9b1 100644
--- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h
@@ -380,6 +380,7 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -375,6 +375,7 @@ class BLINK_PLATFORM_EXPORT Platform {
// satisfy this call. mainFrameOrigin is used by the browser process to
// filter plugins from the plugin list based on content settings.
virtual void GetPluginList(bool refresh,
@ -10,7 +10,7 @@ index 81c92786c4b3..fedd9f01d05a 100644
const WebSecurityOrigin& main_frame_origin,
WebPluginListBuilder*) {}
@@ -745,6 +746,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -734,6 +735,11 @@ class BLINK_PLATFORM_EXPORT Platform {
// runs during Chromium's build step).
virtual bool IsTakingV8ContextSnapshot() { return false; }
@ -62,10 +62,10 @@ index ab50fed4ab5e..e8829a3b8529 100644
void WebDevToolsAgentImpl::Session::SendProtocolResponse(int session_id,
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 64dc367b915b..6c260db5bf90 100644
index 80d6c903d8ef..8433050ec98c 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1177,7 +1177,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
@@ -1193,7 +1193,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;
@ -75,7 +75,7 @@ index 64dc367b915b..6c260db5bf90 100644
}
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
index 9eae0f477b7f..51de5abb8a4c 100644
index 3f4d3f06e7e2..23bbc71f88eb 100644
--- third_party/blink/renderer/core/page/page.cc
+++ third_party/blink/renderer/core/page/page.cc
@@ -153,7 +153,8 @@ Page::Page(PageClients& page_clients)
@ -149,7 +149,7 @@ index 9eae0f477b7f..51de5abb8a4c 100644
visitor->Trace(use_counter_);
visitor->Trace(plugins_changed_observers_);
diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h
index 4ef2efee07ce..c750ef5ae6b8 100644
index 0f51ac4d6e62..ccaae2f1c38f 100644
--- third_party/blink/renderer/core/page/page.h
+++ third_party/blink/renderer/core/page/page.h
@@ -138,7 +138,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@ -162,7 +162,7 @@ index 4ef2efee07ce..c750ef5ae6b8 100644
// Refreshes the browser-side plugin cache.
static void RefreshPlugins();
@@ -373,7 +374,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
@@ -374,7 +375,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
// longer needed.
Member<Frame> main_frame_;

8
patch/patches/webkit_popups.patch
View File

@ -1,5 +1,5 @@
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
index db2e2e88c9f6..19eb6e7f3073 100644
index c25144ef9318..343d1de5f03a 100644
--- third_party/blink/public/web/web_view.h
+++ third_party/blink/public/web/web_view.h
@@ -358,6 +358,7 @@ class WebView : protected WebWidget {
@ -20,7 +20,7 @@ index db2e2e88c9f6..19eb6e7f3073 100644
// Call these methods before and after running a nested, modal event loop
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index f2a2a4d8b3e1..e349385e4ae3 100644
index 7298a752d360..26bac8472a20 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -251,8 +251,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@ -48,7 +48,7 @@ index f2a2a4d8b3e1..e349385e4ae3 100644
suppress_next_keypress_event_(false),
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
index f2a35c0426bd..cf7641477c2e 100644
index 7d13f1c07529..1c664d42eb17 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -102,7 +102,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@ -70,7 +70,7 @@ index f2a35c0426bd..cf7641477c2e 100644
void SetBaseBackgroundColorOverride(WebColor);
void ClearBaseBackgroundColorOverride();
void SetBackgroundColorOverride(WebColor);
@@ -620,6 +621,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -622,6 +623,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_;
bool fake_page_scale_animation_use_anchor_;

2
patch/patches/webui_2037.patch
View File

@ -35,7 +35,7 @@ index 7742a5367ff0..0ec2381dc558 100644
extensions::ExtensionRegistry::Get(profile);
std::string extensions_list;
diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc
index 4c0434b3c6ff..d92a70ce8ead 100644
index 509b62c78375..f48dd53e30c3 100644
--- chrome/browser/memory_details.cc
+++ chrome/browser/memory_details.cc
@@ -16,6 +16,7 @@

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
index 59227ea4c439..228262b9a2d3 100644
index a813c4e812f1..bb54023ff9ea 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -4838,7 +4838,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -4667,7 +4667,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">