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 88.0.4324.87

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-01-19 13:57:34 -05:00
parent ac8e5f01b3
commit 5b4e0eee60
17 changed files with 58 additions and 56 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/88.0.4324.27',
'chromium_checkout': 'refs/tags/88.0.4324.87',
'depot_tools_checkout': '55e9ddf219'
}

11
libcef/browser/image_impl.cc
View File

@@ -6,6 +6,7 @@
#include <algorithm>
#include "skia/ext/skia_utils_base.h"
#include "ui/gfx/codec/jpeg_codec.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_png_rep.h"
@@ -307,7 +308,15 @@ bool CefImageImpl::AddBitmap(float scale_factor, const SkBitmap& bitmap) {
DCHECK(bitmap.colorType() == kBGRA_8888_SkColorType ||
bitmap.colorType() == kRGBA_8888_SkColorType);
gfx::ImageSkiaRep skia_rep(bitmap, scale_factor);
// Convert to N32 (e.g. native encoding) format if not already in that format.
// N32 is expected by the Views framework and this early conversion avoids
// CHECKs in ImageSkiaRep and eventual conversion to N32 at some later point
// in the compositing pipeline.
SkBitmap n32_bitmap;
if (!skia::SkBitmapToN32OpaqueOrPremul(bitmap, &n32_bitmap))
return false;
gfx::ImageSkiaRep skia_rep(n32_bitmap, scale_factor);
base::AutoLock lock_scope(lock_);
if (image_.IsEmpty()) {
image_ = gfx::Image(gfx::ImageSkia(skia_rep));

2
libcef/renderer/render_urlrequest_impl.cc
View File

@@ -53,6 +53,7 @@ class CefWebURLLoaderClient : public blink::WebURLLoaderClient {
int64_t total_decoded_body_length,
bool should_report_corb_blocking) override;
void DidFail(const WebURLError&,
base::TimeTicks finish_time,
int64_t total_encoded_data_length,
int64_t total_encoded_body_length,
int64_t total_decoded_body_length) override;
@@ -378,6 +379,7 @@ void CefWebURLLoaderClient::DidFinishLoading(base::TimeTicks finish_time,
}
void CefWebURLLoaderClient::DidFail(const WebURLError& error,
base::TimeTicks finish_time,
int64_t total_encoded_data_length,
int64_t total_encoded_body_length,
int64_t total_decoded_body_length) {

6
patch/patches/base_sandbox_2743.patch
View File

@@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn
index 9d0250c77571..100fc4b9d860 100644
index 632d70d0a04e..e400946db000 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -33,6 +33,7 @@ import("//build/config/ui.gni")
@@ -10,7 +10,7 @@ index 9d0250c77571..100fc4b9d860 100644
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
import("//third_party/icu/config.gni")
@@ -1655,7 +1656,11 @@ component("base") {
@@ -1657,7 +1658,11 @@ component("base") {
"hash/md5_constexpr_internal.h",
"hash/sha1.h",
]
@@ -23,7 +23,7 @@ index 9d0250c77571..100fc4b9d860 100644
sources += [
"hash/md5_nacl.cc",
"hash/md5_nacl.h",
@@ -1858,6 +1863,12 @@ component("base") {
@@ -1860,6 +1865,12 @@ component("base") {
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
}

2
patch/patches/browser_security_policy_1081397.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
index f4efb7329132..de16a7771365 100644
index 5dea9c7ab461..e8c90f1722ad 100644
--- content/browser/child_process_security_policy_impl.cc
+++ content/browser/child_process_security_policy_impl.cc
@@ -1698,6 +1698,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(

8
patch/patches/chrome_browser.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index a7b0f89b47a0..0e39be05a667 100644
index 2ce41b55b405..abfd93b1d31f 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
@@ -10,7 +10,7 @@ index a7b0f89b47a0..0e39be05a667 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1912,6 +1913,7 @@ static_library("browser") {
@@ -1920,6 +1921,7 @@ static_library("browser") {
"//build:chromeos_buildflags",
"//build/config/compiler:compiler_buildflags",
"//cc",
@@ -18,7 +18,7 @@ index a7b0f89b47a0..0e39be05a667 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2424,6 +2426,10 @@ static_library("browser") {
@@ -2433,6 +2435,10 @@ static_library("browser") {
]
}
@@ -29,7 +29,7 @@ index a7b0f89b47a0..0e39be05a667 100644
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -4981,7 +4987,7 @@ static_library("browser") {
@@ -4990,7 +4996,7 @@ static_library("browser") {
]
}

4
patch/patches/chrome_browser_background_mode_1100085.patch
View File

@@ -118,10 +118,10 @@ index 845abd9ea9ab..29a5cfb36448 100644
// Make a copy of the BrowserList to simplify the case where we need to
// destroy a Browser during the loop.
diff --git chrome/browser/sessions/session_service.cc chrome/browser/sessions/session_service.cc
index 3ccad0af51e7..370475e9f5ff 100644
index da456cbe43e5..f79173ab730e 100644
--- chrome/browser/sessions/session_service.cc
+++ chrome/browser/sessions/session_service.cc
@@ -954,12 +954,19 @@ void SessionService::MaybeDeleteSessionOnlyData() {
@@ -955,12 +955,19 @@ void SessionService::MaybeDeleteSessionOnlyData() {
if (!profile() || profile()->AsTestingProfile())
return;

2
patch/patches/chrome_browser_safe_browsing.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
index 1cab7756e96f..77a8bdde7d62 100644
index 4469d39f1f61..35ffc1c5710e 100644
--- chrome/browser/safe_browsing/BUILD.gn
+++ chrome/browser/safe_browsing/BUILD.gn
@@ -256,6 +256,7 @@ static_library("safe_browsing") {

6
patch/patches/chrome_runtime.patch
View File

@@ -78,7 +78,7 @@ index d9a02faddd91..09a349fcf2b8 100644
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index 195da4bea79f..5f2c60e63623 100644
index 64da51339475..6edca9991546 100644
--- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc
@@ -49,6 +49,7 @@
@@ -89,7 +89,7 @@ index 195da4bea79f..5f2c60e63623 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/active_use_util.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -893,8 +894,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -894,8 +895,10 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
#if !defined(OS_ANDROID)
// Create the RunLoop for MainMessageLoopRun() to use, and pass a copy of
// its QuitClosure to the BrowserProcessImpl to call when it is time to exit.
@@ -101,7 +101,7 @@ index 195da4bea79f..5f2c60e63623 100644
// These members must be initialized before returning from this function.
// Android doesn't use StartupBrowserCreator.
@@ -1615,11 +1618,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1621,11 +1624,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 e9def973e93c..1fe148c4f429 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 1ad0de94d7f7..0d3a60d996aa 100644
index c836b113e985..d88be20becb0 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3739,7 +3739,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -3741,7 +3741,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type;
bool found = false;
Send(new FrameHostMsg_GetPluginInfo(

2
patch/patches/gn_config.patch
View File

@@ -12,7 +12,7 @@ index aed1fea955bd..3c5036a04706 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index 85198646cd31..6c1dbf6921a2 100644
index adf4629ced45..de203635840d 100644
--- BUILD.gn
+++ BUILD.gn
@@ -232,6 +232,7 @@ group("gn_all") {

19
patch/patches/print_preview_123.patch
View File

@@ -304,7 +304,7 @@ index 26954aeae08f..48afeb608f83 100644
base::FilePath GetSaveLocation() const;
diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index adf2433423a5..6bfa66b75b93 100644
index 4064cb61edd7..10497992fa89 100644
--- chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -24,6 +24,7 @@
@@ -315,16 +315,7 @@ index adf2433423a5..6bfa66b75b93 100644
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/bad_message.h"
#include "chrome/browser/browser_process.h"
@@ -1258,7 +1259,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
}
return extension_printer_handler_.get();
}
-#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
+#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) && !BUILDFLAG(ENABLE_CEF)
if (printer_type == PrinterType::kPrivet &&
(base::FeatureList::IsEnabled(features::kForceEnablePrivetPrinting) ||
GetPrefs()->GetBoolean(
@@ -1269,6 +1270,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
@@ -1266,6 +1267,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
}
return privet_printer_handler_.get();
}
@@ -334,7 +325,7 @@ index adf2433423a5..6bfa66b75b93 100644
#endif
if (printer_type == PrinterType::kPdf) {
if (!pdf_printer_handler_) {
@@ -1341,6 +1345,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id,
@@ -1338,6 +1342,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id,
}
void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
@@ -342,7 +333,7 @@ index adf2433423a5..6bfa66b75b93 100644
DCHECK(!identity_manager_);
cloud_print_enabled_ =
!base::Contains(printer_type_deny_list_, PrinterType::kCloud) &&
@@ -1358,6 +1363,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
@@ -1354,6 +1359,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
identity_manager_->AddObserver(this);
@@ -351,7 +342,7 @@ index adf2433423a5..6bfa66b75b93 100644
void PrintPreviewHandler::UnregisterForGaiaCookieChanges() {
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index a1ddf703d113..b0b1f0272dd3 100644
index 1e583ad19d24..6e9621f91d7f 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -28,6 +28,7 @@

2
patch/patches/views_widget.patch
View File

@@ -174,7 +174,7 @@ index 4078ea5dc7be..25f37c487399 100644
XWindow();
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
index 022864f249be..5cc2d7b3bf21 100644
index 915b430611e8..79d046282138 100644
--- ui/platform_window/x11/x11_window.cc
+++ ui/platform_window/x11/x11_window.cc
@@ -92,6 +92,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(

16
patch/patches/web_url_loader_cancel_1617042.patch
View File

@@ -1,5 +1,5 @@
diff --git content/renderer/loader/web_url_loader_impl.h content/renderer/loader/web_url_loader_impl.h
index 71ddc4cd98aa..714d1612e4eb 100644
index d73a7818cf67..8acffdd5f8e0 100644
--- content/renderer/loader/web_url_loader_impl.h
+++ content/renderer/loader/web_url_loader_impl.h
@@ -99,6 +99,7 @@ class CONTENT_EXPORT WebURLLoaderImpl : public blink::WebURLLoader {
@@ -7,7 +7,7 @@ index 71ddc4cd98aa..714d1612e4eb 100644
resource_load_info_notifier_wrapper,
blink::WebURLLoaderClient* client) override;
+ void Cancel() override;
void SetDefersLoading(bool value) override;
void SetDefersLoading(DeferType value) override;
void DidChangePriority(blink::WebURLRequest::Priority new_priority,
int intra_priority_value) override;
@@ -109,8 +110,6 @@ class CONTENT_EXPORT WebURLLoaderImpl : public blink::WebURLLoader {
@@ -20,17 +20,17 @@ index 71ddc4cd98aa..714d1612e4eb 100644
DISALLOW_COPY_AND_ASSIGN(WebURLLoaderImpl);
diff --git third_party/blink/public/platform/web_url_loader.h third_party/blink/public/platform/web_url_loader.h
index 18f605fdf283..760e690ac3d2 100644
index 2db7b64b7948..a9c468d24c21 100644
--- third_party/blink/public/platform/web_url_loader.h
+++ third_party/blink/public/platform/web_url_loader.h
@@ -94,6 +94,10 @@ class WebURLLoader {
@@ -93,6 +93,10 @@ class WebURLLoader {
bool no_mime_sniffing,
std::unique_ptr<ResourceLoadInfoNotifierWrapper>,
WebURLLoaderClient*) = 0;
+
+ // Cancels an asynchronous load. This will appear as a load error to
+ // the client.
+ virtual void Cancel() {}
+
// Suspends/resumes an asynchronous load.
virtual void SetDefersLoading(bool) = 0;
// |kDeferred| is when an asynchronous load is suspended.
// |kDeferredWithBackForwardCache| is when an asynchronous load is suspended

4
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -44,10 +44,10 @@ index d49dc7cb85d5..dc4af48a458d 100644
DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) {
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 4315a68fb8d5..efcf6760b52e 100644
index 8e7878612127..5f0437fa733b 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1795,7 +1795,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -1784,7 +1784,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;

20
patch/patches/webkit_popups_and_background.patch
View File

@@ -11,10 +11,10 @@ index 030a534b2fd1..934abdbc22e6 100644
text_track_margin_percentage(0.0f),
immersive_mode_enabled(false),
diff --git third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
index 945a58c91efa..b5bee8f615ef 100644
index 10c3118f23dc..e2e22d592004 100644
--- third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
+++ third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
@@ -273,6 +273,7 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -275,6 +275,7 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
data.accelerated_video_decode_enabled();
out->user_gesture_required_for_presentation =
data.user_gesture_required_for_presentation();
@@ -23,10 +23,10 @@ index 945a58c91efa..b5bee8f615ef 100644
out->text_track_margin_percentage = data.text_track_margin_percentage();
out->immersive_mode_enabled = data.immersive_mode_enabled();
diff --git third_party/blink/public/common/web_preferences/web_preferences.h third_party/blink/public/common/web_preferences/web_preferences.h
index e2fb2d1d46d3..0783c9145510 100644
index 668be355fd37..ea72f59c5d8a 100644
--- third_party/blink/public/common/web_preferences/web_preferences.h
+++ third_party/blink/public/common/web_preferences/web_preferences.h
@@ -172,6 +172,8 @@ struct BLINK_COMMON_EXPORT WebPreferences {
@@ -174,6 +174,8 @@ struct BLINK_COMMON_EXPORT WebPreferences {
bool user_gesture_required_for_presentation;
@@ -36,10 +36,10 @@ index e2fb2d1d46d3..0783c9145510 100644
// These fields specify the foreground and background color for WebVTT text
diff --git third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
index c40048e55b16..1e5843fc33d2 100644
index 6a6095b712a7..f93b38c22846 100644
--- third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
+++ third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
@@ -476,6 +476,11 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
@@ -481,6 +481,11 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
return r.user_gesture_required_for_presentation;
}
@@ -52,10 +52,10 @@ index c40048e55b16..1e5843fc33d2 100644
return r.text_tracks_enabled;
}
diff --git third_party/blink/public/mojom/webpreferences/web_preferences.mojom third_party/blink/public/mojom/webpreferences/web_preferences.mojom
index 52fbf5b35bb4..2bbcf1c4d78d 100644
index a7e49211da07..f9c5283bbc56 100644
--- third_party/blink/public/mojom/webpreferences/web_preferences.mojom
+++ third_party/blink/public/mojom/webpreferences/web_preferences.mojom
@@ -219,6 +219,8 @@ struct WebPreferences {
@@ -220,6 +220,8 @@ struct WebPreferences {
bool user_gesture_required_for_presentation;
@@ -77,7 +77,7 @@ index 500f7da6e87a..3cbe35f670a5 100644
// Cancels and hides the current popup (datetime, select...) if any.
virtual void CancelPagePopup() = 0;
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index 1ae768c752dd..5a92897f830e 100644
index 4b7d0d5811ba..e87a58f078c6 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -238,8 +238,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -104,7 +104,7 @@ index 1ae768c752dd..5a92897f830e 100644
does_composite_(does_composite),
fullscreen_controller_(std::make_unique<FullscreenController>(this)),
receiver_(this,
@@ -1801,6 +1807,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
@@ -1803,6 +1809,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
RuntimeEnabledFeatures::SetTranslateServiceEnabled(
prefs.translate_service_available);

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 b428727e3195..7115ed56125a 100644
index 2af89a7e76f7..9153dd8e7ea5 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -5085,7 +5085,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -5091,7 +5091,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.">