bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-03-12 01:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 56.0.2924.10

Browse Source
This commit is contained in:
Marshall Greenblatt 2016-11-29 20:43:33 -05:00
parent 12aeeb13f7
commit b4216db56c
6 changed files with 22 additions and 22 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': '3a87aecc31cd1ffe751dd72c04e5a96a1fc8108a',
'chromium_checkout': 'refs/tags/56.0.2924.10',
}

8
patch/patches/print_header_footer_1478_1565.patch
View File

@ -24,7 +24,7 @@ index cb9d140..528091d 100644
using content::NavigationController;
using content::NavigationEntry;
using content::OpenURLParams;
@@ -231,11 +235,15 @@ - (void)handlesStopScriptCommand:(NSScriptCommand*)command {
@@ -231,11 +235,15 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id,
- (void)handlesPrintScriptCommand:(NSScriptCommand*)command {
AppleScript::LogAppleScriptUMA(AppleScript::AppleScriptCommand::TAB_PRINT);
@ -537,7 +537,7 @@ diff --git components/printing/renderer/print_web_view_helper_mac.mm components/
index ff49472..b107439 100644
--- components/printing/renderer/print_web_view_helper_mac.mm
+++ components/printing/renderer/print_web_view_helper_mac.mm
@@ -69,7 +69,6 @@
@@ -69,7 +69,6 @@ void PrintWebViewHelper::PrintPageInternal(
Send(new PrintHostMsg_DidPrintPage(routing_id(), page_params));
}
@ -545,7 +545,7 @@ index ff49472..b107439 100644
bool PrintWebViewHelper::RenderPreviewPage(
int page_number,
const PrintMsg_Print_Params& print_params) {
@@ -106,7 +105,6 @@
@@ -106,7 +105,6 @@ bool PrintWebViewHelper::RenderPreviewPage(
}
return PreviewPageRendered(page_number, draft_metafile.get());
}
@ -553,7 +553,7 @@ index ff49472..b107439 100644
void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
int page_number,
@@ -142,14 +140,12 @@
@@ -142,14 +140,12 @@ void PrintWebViewHelper::RenderPage(const PrintMsg_Print_Params& params,
MetafileSkiaWrapper::SetMetafileOnCanvas(*canvas, metafile);
skia::SetIsPreviewMetafile(*canvas, is_preview);

8
patch/patches/views_widget_180_1481_1677_1749.patch
View File

@ -371,10 +371,10 @@ index 4c21064..2ff6833 100644
// This must come after SetContentsView() or it might not be able to find
// the correct NativeTheme (on Linux). See http://crbug.com/384492
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index 0c7ab33..a958c3a 100644
index 0dd6715..b9d92df 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -233,12 +233,17 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -236,12 +236,17 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// rendered, and that the client area should be equivalent to the window
// area. Only used on some platforms (Windows and Linux).
bool remove_standard_frame;
@ -392,7 +392,7 @@ index 0c7ab33..a958c3a 100644
// Used only by mus and is necessitated by mus not being a NativeView.
ui::Window* parent_mus = nullptr;
// Specifies the initial bounds of the Widget. Default is empty, which means
@@ -752,6 +757,10 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -755,6 +760,10 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
bool movement_disabled() const { return movement_disabled_; }
void set_movement_disabled(bool disabled) { movement_disabled_ = disabled; }
@ -403,7 +403,7 @@ index 0c7ab33..a958c3a 100644
// Returns the work area bounds of the screen the Widget belongs to.
gfx::Rect GetWorkAreaBoundsInScreen() const;
@@ -970,6 +979,10 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -973,6 +982,10 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// disabled.
bool movement_disabled_;

2
patch/patches/web_contents_1257.patch
View File

@ -74,7 +74,7 @@ index 6cdff54..0efcaa2 100644
int opener_render_process_id,
int opener_render_frame_id,
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 8850f6a..1a3719e 100644
index a662439..2b22f27 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -1572,6 +1572,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {

22
patch/patches/webkit_popups.patch
View File

@ -1,8 +1,8 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 1c0863b..a0f06f4 100644
index 0f7c13c..9fac7a7 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -893,7 +893,7 @@ bool ChromeClientImpl::hasOpenedPopup() const {
@@ -892,7 +892,7 @@ bool ChromeClientImpl::hasOpenedPopup() const {
PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame,
HTMLSelectElement& select) {
notifyPopupOpeningObservers();
@ -12,18 +12,18 @@ index 1c0863b..a0f06f4 100644
DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 8e1ca8b..83589b6 100644
index 1330049..66205a3 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -379,6 +379,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
@@ -359,6 +359,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
m_enableFakePageScaleAnimationForTesting(false),
m_fakePageScaleAnimationPageScaleFactor(0),
m_fakePageScaleAnimationUseAnchor(false),
+ m_shouldUseExternalPopupMenus(shouldUseExternalPopupMenus),
m_doingDragAndDrop(false),
m_ignoreInputEvents(false),
m_compositorDeviceScaleFactorOverride(0),
@@ -3727,8 +3728,13 @@ void WebViewImpl::mainFrameScrollOffsetChanged() {
m_suppressNextKeypressEvent(false),
@@ -3708,8 +3709,13 @@ void WebViewImpl::mainFrameScrollOffsetChanged() {
m_devToolsEmulator->mainFrameScrollOrScaleChanged();
}
@ -39,7 +39,7 @@ index 8e1ca8b..83589b6 100644
void WebViewImpl::setIgnoreInputEvents(bool newValue) {
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index d002c0d..74cbb22 100644
index c579e10..a28c544 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -375,7 +375,8 @@ class WEB_EXPORT WebViewImpl final
@ -52,15 +52,15 @@ index d002c0d..74cbb22 100644
bool shouldAutoResize() const { return m_shouldAutoResize; }
@@ -654,6 +655,8 @@ class WEB_EXPORT WebViewImpl final
@@ -651,6 +652,8 @@ class WEB_EXPORT WebViewImpl final
float m_fakePageScaleAnimationPageScaleFactor;
bool m_fakePageScaleAnimationUseAnchor;
+ bool m_shouldUseExternalPopupMenus;
+
// TODO(paulmeyer): Move this to WebWidget once all drag-and-drop functions
// are there.
bool m_doingDragAndDrop;
bool m_ignoreInputEvents;
float m_compositorDeviceScaleFactorOverride;
diff --git public/web/WebView.h public/web/WebView.h
index 3127234..e79f0d2 100644
--- public/web/WebView.h

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 351ceb7..304c765 100644
index 4206b74..5d6af4c 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -7199,7 +7199,7 @@ Keep your key file in a safe place. You will need it to create new versions of y