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 61.0.3163.79

Browse Source
This commit is contained in:
Marshall Greenblatt 2017-09-08 14:33:53 -04:00
parent db997d194f
commit b9a2143541
10 changed files with 30 additions and 30 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/61.0.3163.59',
'chromium_checkout': 'refs/tags/61.0.3163.79',
}

2
patch/patches/chrome_profile.patch
View File

@ -63,7 +63,7 @@ index 4b430133e16f..169ca4765907 100644
content::BrowserContext* GetBrowserContextRedirectedInIncognito(
content::BrowserContext* context);
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index 00635b8f7caf..d15278e571ee 100644
index b9515c144000..378f10a5b3ff 100644
--- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc
@@ -375,7 +375,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)

6
patch/patches/content_1129_2015.patch
View File

@ -429,7 +429,7 @@ index 48b932e878e3..80110f9efcbb 100644
virtual void FocusedNodeChanged(const blink::WebNode& node) {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index f982db960f90..4981ad6dad8e 100644
index 7b56c01f25af..497cd8e97a71 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -2898,7 +2898,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@ -451,7 +451,7 @@ index f982db960f90..4981ad6dad8e 100644
}
void RenderFrameImpl::WillCommitProvisionalLoad() {
@@ -5325,9 +5328,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
@@ -5339,9 +5342,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
(!IsBrowserSideNavigationEnabled() ||
url != pending_navigation_params_->request_params.redirects[0]));
@ -463,7 +463,7 @@ index f982db960f90..4981ad6dad8e 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation(
@@ -5340,7 +5342,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
@@ -5354,7 +5356,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
}
return blink::kWebNavigationPolicyIgnore;
}

14
patch/patches/content_manifest_713806.patch
View File

@ -1,5 +1,5 @@
diff --git content/public/app/mojo/content_browser_manifest.json content/public/app/mojo/content_browser_manifest.json
index 360cc64..b84e346 100644
index 31e7f8e4c31c..15a1a833011a 100644
--- content/public/app/mojo/content_browser_manifest.json
+++ content/public/app/mojo/content_browser_manifest.json
@@ -4,13 +4,14 @@
@ -20,7 +20,7 @@ index 360cc64..b84e346 100644
"plugin": [
"discardable_memory::mojom::DiscardableSharedMemoryManager",
"ui::mojom::Gpu"
@@ -54,10 +55,6 @@
@@ -53,10 +54,6 @@
],
"service_manager:service_factory": [
"service_manager::mojom::ServiceFactory"
@ -31,7 +31,7 @@ index 360cc64..b84e346 100644
]
},
"requires": {
@@ -67,7 +64,6 @@
@@ -66,7 +63,6 @@
"content_browser": [
"ash",
"display",
@ -40,7 +40,7 @@ index 360cc64..b84e346 100644
"geolocation_config"
],
diff --git content/public/app/mojo/content_gpu_manifest.json content/public/app/mojo/content_gpu_manifest.json
index a7d05d7..336eefd 100644
index a7d05d716337..336eefdc7d17 100644
--- content/public/app/mojo/content_gpu_manifest.json
+++ content/public/app/mojo/content_gpu_manifest.json
@@ -15,7 +15,8 @@
@ -54,7 +54,7 @@ index a7d05d7..336eefd 100644
}
}
diff --git content/public/app/mojo/content_plugin_manifest.json content/public/app/mojo/content_plugin_manifest.json
index ed8f326..fc78b99 100644
index ed8f3268cc9a..fc78b9945080 100644
--- content/public/app/mojo/content_plugin_manifest.json
+++ content/public/app/mojo/content_plugin_manifest.json
@@ -4,7 +4,7 @@
@ -75,7 +75,7 @@ index ed8f326..fc78b99 100644
"device": [ "device:power_monitor" ],
"ui": [ "discardable_memory" ]
diff --git content/public/app/mojo/content_renderer_manifest.json content/public/app/mojo/content_renderer_manifest.json
index a44f29e..ed32e78 100644
index a850e12576ab..a3d0267e8b14 100644
--- content/public/app/mojo/content_renderer_manifest.json
+++ content/public/app/mojo/content_renderer_manifest.json
@@ -19,7 +19,8 @@
@ -89,7 +89,7 @@ index a44f29e..ed32e78 100644
"device:battery_monitor",
"device:power_monitor",
diff --git content/public/app/mojo/content_utility_manifest.json content/public/app/mojo/content_utility_manifest.json
index 3ea2993..5caad0c 100644
index 3ea2993ba859..5caad0c5639b 100644
--- content/public/app/mojo/content_utility_manifest.json
+++ content/public/app/mojo/content_utility_manifest.json
@@ -14,7 +14,7 @@

2
patch/patches/pdfium_print_549365.patch
View File

@ -14,7 +14,7 @@ index 80a258ea4..7f343f173 100644
static_library("test_support") {
diff --git fpdfsdk/fpdfview.cpp fpdfsdk/fpdfview.cpp
index 7dbaf7f9e..3b41421e3 100644
index 94cc97885..806ff3b24 100644
--- fpdfsdk/fpdfview.cpp
+++ fpdfsdk/fpdfview.cpp
@@ -37,6 +37,7 @@

10
patch/patches/prefs_content_1161.patch
View File

@ -1,5 +1,5 @@
diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h
index 95656cd4c191..35f26f152c6b 100644
index 41bd254aa4b1..69e445630082 100644
--- content/public/common/common_param_traits_macros.h
+++ content/public/common/common_param_traits_macros.h
@@ -205,6 +205,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@ -11,7 +11,7 @@ index 95656cd4c191..35f26f152c6b 100644
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc
index 767e91cc80ba..34f59feab5e2 100644
index d4ca2a11c2ad..47bbd21d80ea 100644
--- content/public/common/web_preferences.cc
+++ content/public/common/web_preferences.cc
@@ -171,6 +171,7 @@ WebPreferences::WebPreferences()
@ -23,7 +23,7 @@ index 767e91cc80ba..34f59feab5e2 100644
record_whole_document(false),
cookie_enabled(true),
diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h
index 5012952734f0..ed17a578d521 100644
index 5c97e2dadfb2..0fba943595a8 100644
--- content/public/common/web_preferences.h
+++ content/public/common/web_preferences.h
@@ -191,6 +191,7 @@ struct CONTENT_EXPORT WebPreferences {
@ -35,10 +35,10 @@ index 5012952734f0..ed17a578d521 100644
bool record_whole_document;
diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
index f26cc788fc83..fab85a323d87 100644
index 9774050a6ae0..a446b25c849d 100644
--- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc
@@ -1317,6 +1317,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
@@ -1319,6 +1319,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
blink::WebView* web_view,
CompositorDependencies* compositor_deps) {
ApplyWebPreferences(prefs, web_view);

6
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 2f5ef2190d81..fb3dcab86340 100644
index 1ff9dfd84764..f003b82f3b43 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -422,13 +422,6 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host,
@ -16,7 +16,7 @@ index 2f5ef2190d81..fb3dcab86340 100644
}
////////////////////////////////////////////////////////////////////////////////
@@ -740,8 +733,10 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(
@@ -746,8 +739,10 @@ void RenderWidgetHostViewAura::UpdateBackgroundColorFromRenderer(
background_color_ = color;
bool opaque = SkColorGetA(color) == SK_AlphaOPAQUE;
@ -29,7 +29,7 @@ index 2f5ef2190d81..fb3dcab86340 100644
}
bool RenderWidgetHostViewAura::IsMouseLocked() {
@@ -1923,6 +1918,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -1929,6 +1924,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
window_->Init(ui::LAYER_SOLID_COLOR);
window_->layer()->SetColor(background_color_);

4
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@ -374,10 +374,10 @@ index 63fcb9d611e8..7237ae60007f 100644
// the NativeWidget may specify a default size. If the parent is specified,
// |bounds| is in the parent's coordinate system. If the parent is not
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index 559f9688a3f9..f6791443449c 100644
index d74ed45367cb..d081b8172d54 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -2650,8 +2650,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -2655,8 +2655,12 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
active_mouse_tracking_flags_ = 0;
} else if (event.type() == ui::ET_MOUSEWHEEL) {
// Reroute the mouse wheel to the window under the pointer if applicable.

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 effd1bee8a12..1ce0b93decd5 100644
index 7e017d13be52..e9b22ba5ab86 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -1698,6 +1698,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1699,6 +1699,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -15,7 +15,7 @@ index effd1bee8a12..1ce0b93decd5 100644
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -1708,6 +1714,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1709,6 +1715,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@ -23,7 +23,7 @@ index effd1bee8a12..1ce0b93decd5 100644
if (browser_plugin_guest_ && !GuestMode::IsCrossProcessFrameGuest(this)) {
view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
@@ -2272,6 +2279,15 @@ void WebContentsImpl::CreateNewWindow(
@@ -2273,6 +2280,15 @@ void WebContentsImpl::CreateNewWindow(
create_params.renderer_initiated_creation =
main_frame_route_id != MSG_ROUTING_NONE;
@ -39,7 +39,7 @@ index effd1bee8a12..1ce0b93decd5 100644
WebContentsImpl* new_contents = NULL;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -2301,7 +2317,7 @@ void WebContentsImpl::CreateNewWindow(
@@ -2302,7 +2318,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(
@ -48,7 +48,7 @@ index effd1bee8a12..1ce0b93decd5 100644
}
// Save the created window associated with the route so we can show it
// later.
@@ -5345,7 +5361,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
@@ -5380,7 +5396,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 fea487e55174..c5e4bc72b7a7 100644
index 3a3ef6994df0..046e535fd6cb 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -5045,7 +5045,7 @@ Keep your key file in a safe place. You will need it to create new versions of y