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

Update to Chromium version 87.0.4280.66

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-11-17 21:22:51 -05:00
parent bbf40c7646
commit 68f4b0c134
14 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/87.0.4280.47',
'chromium_checkout': 'refs/tags/87.0.4280.66',
'depot_tools_checkout': '39d870e1f0'
}

6
patch/patches/base_sandbox_2743.patch
View File

@@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn
index 1d449b35bf40..0b859084ba1c 100644
index 1d97f72804f2..5267c89c96e5 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -33,6 +33,7 @@ import("//build/config/ui.gni")
@@ -10,7 +10,7 @@ index 1d449b35bf40..0b859084ba1c 100644
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
import("//third_party/icu/config.gni")
@@ -1646,7 +1647,11 @@ component("base") {
@@ -1652,7 +1653,11 @@ component("base") {
"hash/md5_constexpr_internal.h",
"hash/sha1.h",
]
@@ -23,7 +23,7 @@ index 1d449b35bf40..0b859084ba1c 100644
sources += [
"hash/md5_nacl.cc",
"hash/md5_nacl.h",
@@ -1841,6 +1846,12 @@ component("base") {
@@ -1847,6 +1852,12 @@ component("base") {
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
}

6
patch/patches/chrome_browser.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 4dd4cabe46e1..ac61cbbaf234 100644
index 62ddc2d8548b..371fbad54312 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
@@ -10,7 +10,7 @@ index 4dd4cabe46e1..ac61cbbaf234 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1885,6 +1886,7 @@ static_library("browser") {
@@ -1883,6 +1884,7 @@ static_library("browser") {
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//cc",
@@ -18,7 +18,7 @@ index 4dd4cabe46e1..ac61cbbaf234 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2363,6 +2365,10 @@ static_library("browser") {
@@ -2361,6 +2363,10 @@ static_library("browser") {
]
}

12
patch/patches/chrome_browser_background_mode_1100085.patch
View File

@@ -35,10 +35,10 @@ index ce66d73e0fa4..cc62e05ba3ba 100644
return dockMenu;
}
diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
index b6fe1fee2cbb..84a75c6070d6 100644
index a453e1acb6db..45ef09287f7b 100644
--- chrome/browser/browser_process.h
+++ chrome/browser/browser_process.h
@@ -202,10 +202,12 @@ class BrowserProcess {
@@ -207,10 +207,12 @@ class BrowserProcess {
virtual DownloadStatusUpdater* download_status_updater() = 0;
virtual DownloadRequestLimiter* download_request_limiter() = 0;
@@ -52,10 +52,10 @@ index b6fe1fee2cbb..84a75c6070d6 100644
// Returns the StatusTray, which provides an API for displaying status icons
// in the system status tray. Returns NULL if status icons are not supported
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
index 443348c2de00..7486628a9912 100644
index b56d49bdb10b..422ed84c6e45 100644
--- chrome/browser/browser_process_impl.cc
+++ chrome/browser/browser_process_impl.cc
@@ -951,24 +951,19 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
@@ -954,24 +954,19 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
return download_request_limiter_.get();
}
@@ -83,10 +83,10 @@ index 443348c2de00..7486628a9912 100644
StatusTray* BrowserProcessImpl::status_tray() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h
index 8a8d8a820690..c06d97c65ec2 100644
index 7cc470fe599d..b7dd5c71ce88 100644
--- chrome/browser/browser_process_impl.h
+++ chrome/browser/browser_process_impl.h
@@ -163,9 +163,11 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -165,9 +165,11 @@ class BrowserProcessImpl : public BrowserProcess,
void SetApplicationLocale(const std::string& actual_locale) override;
DownloadStatusUpdater* download_status_updater() override;
DownloadRequestLimiter* download_request_limiter() override;

6
patch/patches/chrome_browser_net_export.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index ea9c946036b3..1ed77f3895de 100644
index ff8643975565..7fdb9a3ab7f7 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/crypto.gni")
@@ -35,9 +35,9 @@ index ea9c946036b3..1ed77f3895de 100644
"//components/printing/browser",
+ "//components/printing/common:mojo_interfaces",
"//components/profile_metrics",
"//components/safe_browsing/core/common:safe_browsing_policy_handler",
"//components/safety_check",
"//components/search_provider_logos",
@@ -3245,7 +3252,9 @@ static_library("ui") {
@@ -3249,7 +3256,9 @@ static_library("ui") {
"views/frame/browser_desktop_window_tree_host_platform.h",
]
}

4
patch/patches/chrome_runtime.patch
View File

@@ -78,7 +78,7 @@ index 8b7b6f492b3e..1085e4b1e23d 100644
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index c9bf19474a2a..3c1d5eec82fa 100644
index 19746df8b0a5..2a78bdb895d7 100644
--- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc
@@ -49,6 +49,7 @@
@@ -101,7 +101,7 @@ index c9bf19474a2a..3c1d5eec82fa 100644
// These members must be initialized before returning from this function.
// Android doesn't use StartupBrowserCreator.
@@ -1613,11 +1616,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1615,11 +1618,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// This step is costly and is already measured in
// Startup.StartupBrowserCreator_Start.
// See the comment above for an explanation of |process_command_line|.

4
patch/patches/content_2015.patch
View File

@@ -340,10 +340,10 @@ index 12e091c7c13d..513db858b8fa 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index e811aec4853c..a1c857d4c6cc 100644
index 72a3bd4837f3..4d6d026675be 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3898,7 +3898,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -3900,7 +3900,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type;
bool found = false;
Send(new FrameHostMsg_GetPluginInfo(

10
patch/patches/crashpad_1995.patch
View File

@@ -363,7 +363,7 @@ index e1c66df6cecf..681dd496292e 100644
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
}
diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm
index aa7c3302f2e3..c471132afe3f 100644
index eb675321436a..4e74af742ed5 100644
--- components/crash/core/app/crashpad_mac.mm
+++ components/crash/core/app/crashpad_mac.mm
@@ -16,12 +16,15 @@
@@ -412,8 +412,8 @@ index aa7c3302f2e3..c471132afe3f 100644
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// Empty means stable.
@@ -62,12 +75,16 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
process_annotations["channel"] = "";
@@ -68,12 +81,16 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
process_annotations["channel"] = base::SysNSStringToUTF8(channel);
}
- NSString* version =
@@ -434,7 +434,7 @@ index aa7c3302f2e3..c471132afe3f 100644
} // @autoreleasepool
return process_annotations;
}();
@@ -127,10 +144,10 @@ base::FilePath PlatformCrashpadInitialization(
@@ -133,10 +150,10 @@ base::FilePath PlatformCrashpadInitialization(
if (initial_client) {
@autoreleasepool {
@@ -449,7 +449,7 @@ index aa7c3302f2e3..c471132afe3f 100644
// Is there a way to recover if this fails?
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
@@ -159,6 +176,12 @@ base::FilePath PlatformCrashpadInitialization(
@@ -165,6 +182,12 @@ base::FilePath PlatformCrashpadInitialization(
"--reset-own-crash-exception-port-to-system-default");
}

4
patch/patches/extensions_1947.patch
View File

@@ -159,10 +159,10 @@ index 1832f5e9acd6..059cb2a43578 100644
// once each time the extensions system is loaded per browser_context. The
// implementation may wish to use the BrowserContext to record the current
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
index 5c593b03d84e..c9588c09f23f 100644
index f41d44299518..41e892cdf240 100644
--- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc
@@ -385,9 +385,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
@@ -411,9 +411,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
return true; // TODO(kalman): return false here? It might break things...
DVLOG(1) << "CreateBackgroundHost " << extension->id();

2
patch/patches/gn_config.patch
View File

@@ -95,7 +95,7 @@ index 9323a774a565..913b5cdc6be4 100644
public_deps += [ ":${target_name}_200_percent" ]
}
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
index 7c7af8c0d948..c7869c760b12 100644
index df39ea145cc6..93401d47e437 100644
--- chrome/installer/mini_installer/BUILD.gn
+++ chrome/installer/mini_installer/BUILD.gn
@@ -5,6 +5,7 @@

6
patch/patches/views_1749_2102.patch
View File

@@ -43,7 +43,7 @@ index c746b37d6278..b6cebc24b73e 100644
virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index 26328ded8b82..fd45a2972a7c 100644
index af1d3fa49ca0..a8f1cbac8690 100644
--- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc
@@ -615,6 +615,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) {
@@ -119,7 +119,7 @@ index 7a6dda99623b..7476e8966285 100644
// Size used for the default SquareInkDropRipple.
static constexpr gfx::Size kDefaultInkDropSize = gfx::Size(24, 24);
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
index b8dada677222..87d790657722 100644
index f330d677e93f..595dfcc619d4 100644
--- ui/views/controls/button/label_button.cc
+++ ui/views/controls/button/label_button.cc
@@ -513,6 +513,12 @@ void LabelButton::OnThemeChanged() {
@@ -136,7 +136,7 @@ index b8dada677222..87d790657722 100644
Button::StateChanged(old_state);
ResetLabelEnabledColor();
diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
index 4990f7e6ee48..c111e11f5100 100644
index 9be9035f7b5d..c4d7b86d78f9 100644
--- ui/views/controls/button/label_button.h
+++ ui/views/controls/button/label_button.h
@@ -134,6 +134,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {

12
patch/patches/views_widget.patch
View File

@@ -314,11 +314,11 @@ index 0229c1c41502..992f89126f7f 100644
// a reference.
corewm::TooltipWin* tooltip_;
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 710d52bcc34f..25608ba3d188 100644
index d784b8eae003..eeb87fbe5f0c 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -283,7 +283,8 @@ void Widget::Init(InitParams params) {
params.name = params.delegate->GetContentsView()->GetClassName();
@@ -291,7 +291,8 @@ void Widget::Init(InitParams params) {
parent_ = params.parent ? GetWidgetForNativeView(params.parent) : nullptr;
params.child |= (params.type == InitParams::TYPE_CONTROL);
- is_top_level_ = !params.child;
@@ -327,7 +327,7 @@ index 710d52bcc34f..25608ba3d188 100644
if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred &&
params.type != views::Widget::InitParams::TYPE_WINDOW) {
@@ -365,7 +366,12 @@ void Widget::Init(InitParams params) {
@@ -373,7 +374,12 @@ void Widget::Init(InitParams params) {
}
} else if (delegate) {
SetContentsView(delegate->TransferOwnershipOfContentsView());
@@ -341,7 +341,7 @@ index 710d52bcc34f..25608ba3d188 100644
}
observer_manager_.Add(GetNativeTheme());
@@ -1149,10 +1155,16 @@ void Widget::OnNativeWidgetDestroyed() {
@@ -1157,10 +1163,16 @@ void Widget::OnNativeWidgetDestroyed() {
}
gfx::Size Widget::GetMinimumSize() const {
@@ -359,7 +359,7 @@ index 710d52bcc34f..25608ba3d188 100644
}
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index bb19a2cceb28..d62b6dbbecc9 100644
index e1e380513db3..884be29aa487 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -317,6 +317,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,

10
patch/patches/web_contents_1257_1565.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index a39f43b61afc..98d2c97dd617 100644
index 2640a8c63710..44fe2b74b1ef 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -2769,7 +2769,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2770,7 +2770,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
// main frame - let's do the same thing here.
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -16,7 +16,7 @@ index a39f43b61afc..98d2c97dd617 100644
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2780,6 +2786,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2781,6 +2787,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@@ -24,7 +24,7 @@ index a39f43b61afc..98d2c97dd617 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -3651,6 +3658,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3660,6 +3667,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@@ -40,7 +40,7 @@ index a39f43b61afc..98d2c97dd617 100644
std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -7592,6 +7608,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -7601,6 +7617,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary();
}

2
patch/patches/webview_plugin_2020.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 27ad183c8d27..1ba94c1b7c36 100644
index e4aaf55ccfce..2d5d8f53ffb6 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -5081,7 +5081,7 @@ Keep your key file in a safe place. You will need it to create new versions of y