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

Update to Chromium version 84.0.4147.38

Browse Source
This commit is contained in:
Marshall Greenblatt 2020-06-11 16:44:33 -04:00
parent a9aef28966
commit 98e6450272
14 changed files with 39 additions and 39 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/84.0.4147.0'
'chromium_checkout': 'refs/tags/84.0.4147.38'
}

6
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index ffbec39c3e56..573ee6f18653 100644
index 5f82bb3beaf7..7183b9dc8005 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/crypto.gni")
@ -10,7 +10,7 @@ index ffbec39c3e56..573ee6f18653 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1979,6 +1980,7 @@ static_library("browser") {
@@ -1977,6 +1978,7 @@ static_library("browser") {
"//base/util/values:values_util",
"//build:branding_buildflags",
"//cc",
@ -18,7 +18,7 @@ index ffbec39c3e56..573ee6f18653 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2313,6 +2315,10 @@ static_library("browser") {
@@ -2311,6 +2313,10 @@ static_library("browser") {
]
}

8
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 284154368652..cdd775136329 100644
index 6270fdc0a32f..5ba70bf0ecda 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/crypto.gni")
@ -10,7 +10,7 @@ index 284154368652..cdd775136329 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/assistant/assistant.gni")
@@ -362,6 +363,10 @@ static_library("ui") {
@@ -360,6 +361,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@ -21,7 +21,7 @@ index 284154368652..cdd775136329 100644
# Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less
@@ -383,6 +388,7 @@ static_library("ui") {
@@ -381,6 +386,7 @@ static_library("ui") {
"//base/allocator:buildflags",
"//build:branding_buildflags",
"//cc/paint",
@ -29,7 +29,7 @@ index 284154368652..cdd775136329 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -1489,6 +1495,7 @@ static_library("ui") {
@@ -1487,6 +1493,7 @@ static_library("ui") {
"//components/keep_alive_registry",
"//components/network_session_configurator/common",
"//components/page_load_metrics/browser",

4
patch/patches/chrome_plugins.patch
View File

@ -165,7 +165,7 @@ index 4e64db143b8a..71322b0261a1 100644
Profile* profile = Profile::FromBrowserContext(browser_context);
std::vector<std::string> whitelist = MimeTypesHandler::GetMIMETypeWhitelist();
diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
index a9ee607a2cb0..347261030e0e 100644
index 5af3086ef4d1..938a00f72501 100644
--- chrome/common/google_url_loader_throttle.cc
+++ chrome/common/google_url_loader_throttle.cc
@@ -5,10 +5,15 @@
@ -184,7 +184,7 @@ index a9ee607a2cb0..347261030e0e 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "extensions/common/extension_urls.h"
#endif
@@ -126,6 +131,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
@@ -130,6 +135,11 @@ void GoogleURLLoaderThrottle::WillProcessResponse(
const GURL& response_url,
network::mojom::URLResponseHead* response_head,
bool* defer) {

10
patch/patches/content_2015.patch
View File

@ -224,10 +224,10 @@ index 632ae86c6fd6..55b749ec1242 100644
const std::vector<WebPluginInfo>& all_plugins);
diff --git content/common/frame_messages.h content/common/frame_messages.h
index 0821c7061118..fed37861b6b2 100644
index bec2919abc99..4186be149a81 100644
--- content/common/frame_messages.h
+++ content/common/frame_messages.h
@@ -615,9 +615,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
@@ -621,9 +621,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the
// found plugin.
@ -340,10 +340,10 @@ index 7da02ee54143..6436dc300c43 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 34cdad7f7205..60042cb8b4e6 100644
index d34614191378..14ab0168132d 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3663,7 +3663,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -3670,7 +3670,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type;
bool found = false;
Send(new FrameHostMsg_GetPluginInfo(
@ -354,7 +354,7 @@ index 34cdad7f7205..60042cb8b4e6 100644
if (!found)
return nullptr;
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 3b99b09c45e9..a6b9562d1c5c 100644
index b305148481d7..8d776083561c 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -633,6 +633,8 @@ void RenderThreadImpl::Init() {

8
patch/patches/osr_fling_2745.patch
View File

@ -41,10 +41,10 @@ index cc4b13a7b9c6..84f3b9ed7cf4 100644
} // namespace content
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
index bb483be1fbfb..d33a95e2dee3 100644
index 32bf02853741..84ceaed97471 100644
--- content/browser/renderer_host/render_widget_host_impl.cc
+++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -2735,6 +2735,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
@@ -2736,6 +2736,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
}
@ -57,10 +57,10 @@ index bb483be1fbfb..d33a95e2dee3 100644
const WebInputEvent& event) {
if ((base::FeatureList::IsEnabled(
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
index 7200b0616892..733833deb5e0 100644
index 88d4c4a3b45b..cd0d0f909933 100644
--- content/browser/renderer_host/render_widget_host_impl.h
+++ content/browser/renderer_host/render_widget_host_impl.h
@@ -741,6 +741,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -737,6 +737,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
void ProgressFlingIfNeeded(base::TimeTicks current_time);
void StopFling();

10
patch/patches/print_preview_123.patch
View File

@ -262,7 +262,7 @@ index 0881b3dd9303..4df6883d4d05 100644
Profile* const profile_;
PrintPreviewStickySettings* const sticky_settings_;
diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 1d2254cefc2c..7aa5fe7f11a4 100644
index deefb4213851..044a09a8bb3d 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 @@
@ -273,7 +273,7 @@ index 1d2254cefc2c..7aa5fe7f11a4 100644
#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/bad_message.h"
#include "chrome/browser/browser_process.h"
@@ -1243,7 +1244,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
@@ -1245,7 +1246,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
}
return extension_printer_handler_.get();
}
@ -282,7 +282,7 @@ index 1d2254cefc2c..7aa5fe7f11a4 100644
if (printer_type == PrinterType::kPrivet) {
if (!privet_printer_handler_) {
privet_printer_handler_ =
@@ -1251,6 +1252,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
@@ -1253,6 +1254,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
}
return privet_printer_handler_.get();
}
@ -292,7 +292,7 @@ index 1d2254cefc2c..7aa5fe7f11a4 100644
#endif
if (printer_type == PrinterType::kPdf) {
if (!pdf_printer_handler_) {
@@ -1323,6 +1327,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id,
@@ -1325,6 +1329,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id,
}
void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
@ -300,7 +300,7 @@ index 1d2254cefc2c..7aa5fe7f11a4 100644
DCHECK(!identity_manager_);
cloud_print_enabled_ =
!base::Contains(printer_type_deny_list_, PrinterType::kCloud) &&
@@ -1339,6 +1344,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
@@ -1341,6 +1346,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
identity_manager_->AddObserver(this);

2
patch/patches/printing_context_2196.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
index 9122bbf4f15c..b6a190193a87 100644
index 65065b781a0a..b4a165878175 100644
--- chrome/browser/printing/print_job_worker.cc
+++ chrome/browser/printing/print_job_worker.cc
@@ -134,6 +134,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)

2
patch/patches/services_network_2622.patch
View File

@ -58,7 +58,7 @@ index a48ead96b3f7..967a5975c330 100644
// specified isolated app (or for the profile itself, if |relative_path| is
// empty).
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index 69652bdb5952..f1554d00df7b 100644
index 533cc97ba715..36d9f1f3b511 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -476,6 +476,25 @@ void CookieMonster::SetCookieableSchemes(

6
patch/patches/storage_incognito_2289.patch
View File

@ -13,10 +13,10 @@ index f90e9fce0675..33551a2874bc 100644
{base::MayBlock(), base::TaskPriority::USER_VISIBLE,
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index 05473c622dbd..9cd0e465fd2d 100644
index 85251cbcd6b5..27e09121205f 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -129,7 +129,7 @@ StoragePartition* GetStoragePartitionFromConfig(
@@ -130,7 +130,7 @@ StoragePartition* GetStoragePartitionFromConfig(
StoragePartitionImplMap* partition_map =
GetStoragePartitionMap(browser_context);
@ -25,7 +25,7 @@ index 05473c622dbd..9cd0e465fd2d 100644
in_memory = true;
return partition_map->Get(partition_domain, partition_name, in_memory,
@@ -543,7 +543,7 @@ media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
@@ -546,7 +546,7 @@ media::VideoDecodePerfHistory* BrowserContext::GetVideoDecodePerfHistory() {
kUseInMemoryDBDefault);
std::unique_ptr<media::VideoDecodeStatsDB> stats_db;

12
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 024415bb096e..0166b65c74ad 100644
index 7908a60e1743..895d5fc53021 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -2096,15 +2096,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2102,15 +2102,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -33,7 +33,7 @@ index 024415bb096e..0166b65c74ad 100644
}
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -2905,6 +2912,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -2911,6 +2918,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@ -49,7 +49,7 @@ index 024415bb096e..0166b65c74ad 100644
std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -6262,6 +6278,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -6268,6 +6284,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary();
}
@ -131,10 +131,10 @@ index 7757c7720406..356fb0577bae 100644
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
index f80da27979a7..0a04f21c131d 100644
index f0f6c11f5998..80e6b3efcde9 100644
--- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h
@@ -570,6 +570,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
@@ -573,6 +573,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
// WebContents has gained/lost focus.
virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}

2
patch/patches/webkit_plugin_info_2015.patch
View File

@ -44,7 +44,7 @@ index 8d1802954e22..4ec2caa2fd92 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 453cc53860af..f42e2a34ab23 100644
index 923913ab9dd9..c7870736ab29 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1365,7 +1365,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {

2
patch/patches/webkit_popups.patch
View File

@ -62,7 +62,7 @@ index ae5bf526b8ae..3cffd679a402 100644
TransformationMatrix device_emulation_transform_;
diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
index 7042aadd14dc..198d39e5be57 100644
index e4267ec821f9..818bf94a27ab 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -830,7 +830,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {

4
patch/patches/webview_plugin_2020.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 389326ded5a4..07c48ccb54f0 100644
index 9cd853cbda6a..5643832919a7 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -5002,7 +5002,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -4996,7 +4996,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.">