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 54.0.2840.59

Browse Source
This commit is contained in:
Marshall Greenblatt
2016-10-14 16:57:43 -04:00
parent bf6e3f5e98
commit 4e029f4dc2
15 changed files with 96 additions and 35 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/54.0.2840.16',
'chromium_checkout': 'refs/tags/54.0.2840.59',
}

8
libcef/browser/browser_urlrequest_impl.cc
View File

@@ -41,7 +41,9 @@ class CefURLFetcherDelegate : public net::URLFetcherDelegate {
// net::URLFetcherDelegate methods.
void OnURLFetchComplete(const net::URLFetcher* source) override;
void OnURLFetchDownloadProgress(const net::URLFetcher* source,
int64 current, int64 total) override;
int64_t current,
int64_t total,
int64_t current_network_bytes) override;
void OnURLFetchUploadProgress(const net::URLFetcher* source,
int64 current, int64 total) override;
@@ -402,7 +404,9 @@ void CefURLFetcherDelegate::OnURLFetchComplete(
void CefURLFetcherDelegate::OnURLFetchDownloadProgress(
const net::URLFetcher* source,
int64 current, int64 total) {
int64_t current,
int64_t total,
int64_t current_network_bytes) {
context_->OnDownloadProgress(current, total);
}

8
patch/patch.cfg
View File

@@ -22,6 +22,8 @@ patches = [
#
# Write environment.* files with the correct SDK version on Windows.
# https://bugs.chromium.org/p/chromium/issues/detail?id=634788
#
# Fix missing dependencies.
'name': 'gn_config',
'path': '../',
},
@@ -256,4 +258,10 @@ patches = [
'name': 'storage_partition_1973',
'path': '../',
},
{
# Fix PDF extension loading after showing the plugin placeholder.
# Reverts https://codereview.chromium.org/2352673003
'name': 'webview_plugin_2352673003',
'path': '../',
},
]

12
patch/patches/chrome_crashpad_mac.patch
View File

@@ -12,10 +12,10 @@ index 0e9c5ae..28fc90a 100644
// TODO(calamity): Make this gated on first_run::IsChromeFirstRun() in M45.
content::BrowserThread::PostAfterStartupTask(
diff --git chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc
index d62973e..fc2dfa4 100644
index 2879079..dc6bb5b 100644
--- chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc
+++ chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc
@@ -75,8 +75,6 @@ void CrashUploadListCrashpad::LoadUploadList(
@@ -94,8 +94,6 @@ void CrashUploadListCrashpad::LoadUploadList(
// database lives in the .exe, so we need to grab a pointer to a helper in the
// exe to get our reports list.
GetReportsThunk(&reports);
@@ -24,6 +24,14 @@ index d62973e..fc2dfa4 100644
#endif
for (const crash_reporter::Report& report : reports) {
@@ -112,7 +110,5 @@ void CrashUploadListCrashpad::RequestSingleCrashUpload(
// On Windows, crash reporting is handled by chrome_elf.dll, that's why we
// can't call crash_reporter::RequestSingleCrashUpload directly.
RequestSingleCrashUploadThunk(local_id);
-#else
- crash_reporter::RequestSingleCrashUpload(local_id);
#endif
}
diff --git chrome/browser/google/google_update_settings_posix.cc chrome/browser/google/google_update_settings_posix.cc
index d053b1e..cdecb1a 100644
--- chrome/browser/google/google_update_settings_posix.cc

2
patch/patches/chrome_widevine.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc
index 483c3c8..86cd70c 100644
index f73a134..2b02cbd 100644
--- chrome/common/chrome_content_client.cc
+++ chrome/common/chrome_content_client.cc
@@ -77,7 +77,7 @@

6
patch/patches/content_nav_1129.patch
View File

@@ -39,10 +39,10 @@ index b7b042f..69a62f2 100644
// built in media player for the given |url|. Defaults to false.
virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
index 4a2c71f..fc61d73 100644
index d1f9dcf..667abb6 100644
--- renderer/render_frame_impl.cc
+++ renderer/render_frame_impl.cc
@@ -4924,7 +4924,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4947,7 +4947,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
(pending_navigation_params_ &&
!pending_navigation_params_->request_params.redirects.empty());
@@ -50,7 +50,7 @@ index 4a2c71f..fc61d73 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation(
@@ -4933,7 +4932,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -4956,7 +4955,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}

21
patch/patches/gn_config.patch
View File

@@ -104,10 +104,10 @@ index 829e718..89361a0 100755
# directory in order to run binaries locally, but they are needed in order
# to create isolates or the mini_installer. Copying them to the output
diff --git chrome/BUILD.gn chrome/BUILD.gn
index aa67e96..e2af2f3 100644
index 80378a8..e4e28cd 100644
--- chrome/BUILD.gn
+++ chrome/BUILD.gn
@@ -709,7 +709,7 @@ if (is_win) {
@@ -704,7 +704,7 @@ if (is_win) {
]
foreach(locale, locales_as_mac_outputs) {
@@ -117,10 +117,10 @@ index aa67e96..e2af2f3 100644
outputs = [
diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
index b9a1d95..54d7677 100644
index 83b1e19..efc4d07 100644
--- chrome/chrome_repack_locales.gni
+++ chrome/chrome_repack_locales.gni
@@ -189,9 +189,9 @@ template("chrome_repack_locales") {
@@ -184,9 +184,9 @@ template("chrome_repack_locales") {
if (defined(invoker.output_dir)) {
output = "${invoker.output_dir}/${output_locale}.pak"
} else if (is_mac || is_ios) {
@@ -145,3 +145,16 @@ index 1e269aa..b562c3e 100644
"$root_out_dir/setup.exe",
release_file,
]
diff --git content/renderer/mus/BUILD.gn content/renderer/mus/BUILD.gn
index efadacc..47fa5ff 100644
--- content/renderer/mus/BUILD.gn
+++ content/renderer/mus/BUILD.gn
@@ -20,6 +20,7 @@ static_library("mus") {
deps = [
"//base",
"//cc",
+ "//components/memory_coordinator/common",
"//content/common",
"//content/public/child:child_sources",
"//content/public/common:common_sources",

2
patch/patches/pdfium_print_549365.patch
View File

@@ -14,7 +14,7 @@ index ca2338f..a5e62a2 100644
static_library("test_support") {
diff --git fpdfsdk/fpdfview.cpp fpdfsdk/fpdfview.cpp
index dee71ac..e2563bc 100644
index 1c0af1d..5898992 100644
--- fpdfsdk/fpdfview.cpp
+++ fpdfsdk/fpdfview.cpp
@@ -28,6 +28,7 @@

4
patch/patches/prefs_content_1161.patch
View File

@@ -35,10 +35,10 @@ index f9b778b..35f1967 100644
bool inert_visual_viewport;
bool record_whole_document;
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
index c544c288..3ab4478 100644
index f6c5849..fc23755 100644
--- renderer/render_view_impl.cc
+++ renderer/render_view_impl.cc
@@ -1491,6 +1491,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
@@ -1480,6 +1480,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
blink::WebView* web_view,
CompositorDependencies* compositor_deps) {
ApplyWebPreferences(prefs, web_view);

2
patch/patches/render_widget_host_1070383005.patch
View File

@@ -1,5 +1,5 @@
diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm
index f918d13..4a242e8 100644
index 825941f..02e401c 100644
--- render_widget_host_view_mac.mm
+++ render_widget_host_view_mac.mm
@@ -467,9 +467,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,

2
patch/patches/storage_partition_1973.patch
View File

@@ -275,7 +275,7 @@ index 7fb91a6..503e6ba 100644
// The observers watching our lifetime.
base::ObserverList<RenderProcessHostObserver> observers_;
diff --git content/browser/site_instance_impl.cc content/browser/site_instance_impl.cc
index 8978640..a1e4cdd 100644
index a55d786..9e0de6a 100644
--- content/browser/site_instance_impl.cc
+++ content/browser/site_instance_impl.cc
@@ -116,9 +116,8 @@ RenderProcessHost* SiteInstanceImpl::GetProcess() {

4
patch/patches/views_widget_180_1481_1677_1749.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 c681785..fc49f2d 100644
index b3abe7c..2e44c7d 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -747,6 +747,13 @@ void RenderWidgetHostViewAura::SetKeyboardFocus() {
@@ -365,7 +365,7 @@ index aa3c234..021bd01 100644
x_active_window_ = None;
}
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index ca92c5b..f628c39 100644
index 4b3db3f..103bba3 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -126,9 +126,11 @@ Widget::InitParams::InitParams(Type type)

20
patch/patches/web_contents_1257.patch
View File

@@ -29,7 +29,7 @@ index 712c117..4dc59be 100644
void EnterFullscreenModeForTab(content::WebContents* contents,
const GURL& origin) final;
diff --git chrome/browser/prerender/prerender_contents.cc chrome/browser/prerender/prerender_contents.cc
index ff3f72d..6647f76 100644
index cfdce0c..f419c81 100644
--- chrome/browser/prerender/prerender_contents.cc
+++ chrome/browser/prerender/prerender_contents.cc
@@ -131,7 +131,9 @@ class PrerenderContents::WebContentsDelegateImpl
@@ -44,10 +44,10 @@ index ff3f72d..6647f76 100644
// window.opener property, terminate prerendering.
prerender_contents_->Destroy(FINAL_STATUS_CREATE_NEW_WINDOW);
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 93b36dc..b25c512 100644
index 66a501d..ed28c27 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -1616,7 +1616,9 @@ bool Browser::ShouldCreateWebContents(
@@ -1620,7 +1620,9 @@ bool Browser::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -59,10 +59,10 @@ index 93b36dc..b25c512 100644
// If a BackgroundContents is created, suppress the normal WebContents.
return !MaybeCreateBackgroundContents(
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 693e84d..be1f1dd 100644
index 5ee2e20..9cc79e7 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -617,7 +617,9 @@ class Browser : public TabStripModelObserver,
@@ -619,7 +619,9 @@ class Browser : public TabStripModelObserver,
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -74,7 +74,7 @@ index 693e84d..be1f1dd 100644
int opener_render_frame_id,
const std::string& frame_name,
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 05801d4..04c86da 100644
index b0451e4..203f228 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -1543,6 +1543,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -165,10 +165,10 @@ index efa8ae5..8ea0055 100644
// Creates a new WebContents.
diff --git content/public/browser/web_contents_delegate.cc content/public/browser/web_contents_delegate.cc
index df97348..8e2168e 100644
index f6238e6..84917b0 100644
--- content/public/browser/web_contents_delegate.cc
+++ content/public/browser/web_contents_delegate.cc
@@ -144,7 +144,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
@@ -145,7 +145,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
const std::string& frame_name,
const GURL& target_url,
const std::string& partition_id,
@@ -180,7 +180,7 @@ index df97348..8e2168e 100644
}
diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
index 2816c4d..387821f 100644
index e0d4d5f..ca1a7e86 100644
--- content/public/browser/web_contents_delegate.h
+++ content/public/browser/web_contents_delegate.h
@@ -42,9 +42,11 @@ class JavaScriptDialogManager;
@@ -237,7 +237,7 @@ index e0309f7..f6a3878 100644
// content::WebContentsObserver implementation.
void DidNavigateMainFrame(const content::LoadCommittedDetails& details,
diff --git ui/keyboard/content/keyboard_ui_content.cc ui/keyboard/content/keyboard_ui_content.cc
index cd6a2ab..ef2c820 100644
index a466b63..a14e6da 100644
--- ui/keyboard/content/keyboard_ui_content.cc
+++ ui/keyboard/content/keyboard_ui_content.cc
@@ -64,7 +64,9 @@ class KeyboardContentsDelegate : public content::WebContentsDelegate,

10
patch/patches/webkit_popups.patch
View File

@@ -1,5 +1,5 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index f274fb4..2aa6a17 100644
index 42f11c4..4d1259b 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -873,7 +873,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -12,7 +12,7 @@ index f274fb4..2aa6a17 100644
DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index cae232a..2ed1596 100644
index 7b11f05..a443227 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -417,6 +417,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, WebPageVisibilityState visibilit
@@ -23,7 +23,7 @@ index cae232a..2ed1596 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -4092,9 +4093,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -4096,9 +4097,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@@ -40,7 +40,7 @@ index cae232a..2ed1596 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index 26e93e7..86240c7 100644
index 990005c..828eb58 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -388,7 +388,8 @@ public:
@@ -63,7 +63,7 @@ index 26e93e7..86240c7 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index bba44bc..345f5c2 100644
index c363fb3..6a55713 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -438,6 +438,7 @@ public:

28
patch/patches/webview_plugin_2352673003.patch Normal file
View File

@@ -0,0 +1,28 @@
diff --git components/plugins/renderer/webview_plugin.cc components/plugins/renderer/webview_plugin.cc
index 60d955b..ab11e7b 100644
--- components/plugins/renderer/webview_plugin.cc
+++ components/plugins/renderer/webview_plugin.cc
@@ -95,6 +95,23 @@ WebViewPlugin::~WebViewPlugin() {
}
void WebViewPlugin::ReplayReceivedData(WebPlugin* plugin) {
+ const WebURLResponse& response = web_frame_->dataSource()->response();
+ if (!response.isNull()) {
+ plugin->didReceiveResponse(response);
+ size_t total_bytes = 0;
+ for (std::list<std::string>::iterator it = data_.begin(); it != data_.end();
+ ++it) {
+ plugin->didReceiveData(
+ it->c_str(), base::checked_cast<int, size_t>(it->length()));
+ total_bytes += it->length();
+ }
+ UMA_HISTOGRAM_MEMORY_KB(
+ "PluginDocument.Memory",
+ (base::checked_cast<int, size_t>(total_bytes / 1024)));
+ UMA_HISTOGRAM_COUNTS(
+ "PluginDocument.NumChunks",
+ (base::checked_cast<int, size_t>(data_.size())));
+ }
// We need to transfer the |focused_| to new plugin after it loaded.
if (focused_) {
plugin->updateFocus(true, blink::WebFocusTypeNone);