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 79.0.3945.88

Browse Source
This commit is contained in:
Marshall Greenblatt
2019-12-31 19:50:39 +02:00
parent ba025c621c
commit e866a07123
10 changed files with 41 additions and 14 deletions
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/79.0.3945.36'
'chromium_checkout': 'refs/tags/79.0.3945.88'
}

5
patch/patch.cfg
View File

@@ -472,5 +472,10 @@ patches = [
# Windows: Fix ImportError: No module named win32file
# https://bugs.chromium.org/p/chromium/issues/detail?id=1033106#c7
'name': 'win_tool_wrapper_1033106',
},
{
# Fix Jumbo build errors.
# - error: redefinition of 'CreateExtraView'
'name': 'build_jumbo',
}
]

22
patch/patches/build_jumbo.patch Normal file
View File

@@ -0,0 +1,22 @@
diff --git chrome/browser/ui/views/confirm_bubble_views.cc chrome/browser/ui/views/confirm_bubble_views.cc
index 5f25a23aff9d..994b493b556f 100644
--- chrome/browser/ui/views/confirm_bubble_views.cc
+++ chrome/browser/ui/views/confirm_bubble_views.cc
@@ -27,7 +27,7 @@
namespace {
-std::unique_ptr<views::View> CreateExtraView(views::ButtonListener* listener) {
+std::unique_ptr<views::View> CreateExtraView2(views::ButtonListener* listener) {
auto help_button = CreateVectorImageButton(listener);
help_button->SetFocusForPlatform();
help_button->SetTooltipText(l10n_util::GetStringUTF16(IDS_LEARN_MORE));
@@ -46,7 +46,7 @@ ConfirmBubbleViews::ConfirmBubbleViews(
DialogDelegate::set_button_label(
ui::DIALOG_BUTTON_CANCEL,
model_->GetButtonLabel(ConfirmBubbleModel::BUTTON_CANCEL));
- help_button_ = DialogDelegate::SetExtraView(::CreateExtraView(this));
+ help_button_ = DialogDelegate::SetExtraView(::CreateExtraView2(this));
set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
views::TEXT, views::TEXT));

2
patch/patches/chrome_plugins.patch
View File

@@ -198,7 +198,7 @@ index 0a565575f36c..06dfa59d1a75 100644
GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
if (response_url.SchemeIsHTTPOrHTTPS() &&
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 4d3cfef5b28a..bbcaceebfda2 100644
index 0948ebbbd199..41065dffa3b3 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -794,6 +794,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(

6
patch/patches/content_2015.patch
View File

@@ -307,7 +307,7 @@ index 98c59005599e..69752184745d 100644
WebPluginInfo* plugin) = 0;
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index c1ed9f008b49..d055159b66f9 100644
index 902bd023e6d2..9de1a06cc1ec 100644
--- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h
@@ -72,6 +72,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -320,7 +320,7 @@ index c1ed9f008b49..d055159b66f9 100644
// Notifies that a new RenderFrame has been created.
virtual void RenderFrameCreated(RenderFrame* render_frame) {}
@@ -308,6 +311,10 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -315,6 +318,10 @@ class CONTENT_EXPORT ContentRendererClient {
// This method may invalidate the frame.
virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
@@ -346,7 +346,7 @@ index f764efa250cc..9b2e8c053367 100644
virtual void FocusedElementChanged(const blink::WebElement& element) {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index e793135c1946..c596719cbb6e 100644
index ac736036792f..09b98f37ef86 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -4045,7 +4045,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(

4
patch/patches/gn_config.patch
View File

@@ -12,10 +12,10 @@ index 20f2aad03c82..8cc64748b027 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index 1dc993ffda44..10efbe86e673 100644
index 75ea1abd8317..90c40824356b 100644
--- BUILD.gn
+++ BUILD.gn
@@ -211,6 +211,7 @@ group("gn_all") {
@@ -214,6 +214,7 @@ group("gn_all") {
if (!is_ios && !is_fuchsia) {
deps += [

2
patch/patches/trace_event.patch
View File

@@ -1,5 +1,5 @@
diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
index 14fd70d103a7..2f1ab56307f8 100644
index 1ac3513eb4f7..49a21d1954a3 100644
--- base/trace_event/builtin_categories.h
+++ base/trace_event/builtin_categories.h
@@ -51,6 +51,8 @@

8
patch/patches/web_contents_1257_1565.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index b8105a844635..212358792a5c 100644
index aa2aeccdf7b2..d5409dc4f41b 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -2163,21 +2163,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -45,7 +45,7 @@ index b8105a844635..212358792a5c 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -2878,6 +2887,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -2891,6 +2900,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@@ -61,7 +61,7 @@ index b8105a844635..212358792a5c 100644
// If |is_new_browsing_instance| is true, defer routing_id allocation
// to the WebContentsImpl::Create() call. This is required because with
// a new browsing instance, WebContentsImpl::Create() may elect a different
@@ -2923,7 +2941,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -2936,7 +2954,7 @@ RenderFrameHostDelegate* 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.
RenderWidgetHostView* widget_view = new_view->CreateViewForWidget(
@@ -70,7 +70,7 @@ index b8105a844635..212358792a5c 100644
if (!renderer_started_hidden) {
// RenderWidgets for frames always initialize as hidden. If the renderer
// created this window as visible, then we show it here.
@@ -6616,7 +6634,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
@@ -6629,7 +6647,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view =

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 021fc110d824..b2703ae850af 100644
index 84208f948371..0d3563b4838c 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -4769,7 +4769,7 @@ Keep your key file in a safe place. You will need it to create new versions of y

2
patch/patches/win_rt_2274.patch
View File

@@ -1,5 +1,5 @@
diff --git services/service_manager/sandbox/win/sandbox_win.cc services/service_manager/sandbox/win/sandbox_win.cc
index 7fca3e218b4e..fc1b03056caa 100644
index 6357fb4169b1..a4527cc46516 100644
--- services/service_manager/sandbox/win/sandbox_win.cc
+++ services/service_manager/sandbox/win/sandbox_win.cc
@@ -929,8 +929,11 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(