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 revision 231322.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1494 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-10-29 17:53:18 +00:00
parent 74fea9e2b9
commit 0c45f66d37
25 changed files with 331 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patch/patches/webkit_popups.patch
View File

@@ -1,8 +1,8 @@
Index: public/web/WebView.h
===================================================================
--- public/web/WebView.h (revision 159695)
--- public/web/WebView.h (revision 160715)
+++ public/web/WebView.h (working copy)
@@ -447,6 +447,7 @@
@@ -441,6 +441,7 @@
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);
@@ -12,9 +12,9 @@ Index: public/web/WebView.h
// Visited link state --------------------------------------------------
Index: Source/web/ChromeClientImpl.cpp
===================================================================
--- Source/web/ChromeClientImpl.cpp (revision 159695)
--- Source/web/ChromeClientImpl.cpp (revision 160715)
+++ Source/web/ChromeClientImpl.cpp (working copy)
@@ -875,7 +875,7 @@
@@ -871,7 +871,7 @@
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
{
@@ -25,9 +25,9 @@ Index: Source/web/ChromeClientImpl.cpp
return adoptRef(new PopupMenuChromium(frame, client));
Index: Source/web/WebViewImpl.cpp
===================================================================
--- Source/web/WebViewImpl.cpp (revision 159695)
--- Source/web/WebViewImpl.cpp (revision 160715)
+++ Source/web/WebViewImpl.cpp (working copy)
@@ -411,6 +411,7 @@
@@ -402,6 +402,7 @@
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false)
@@ -35,7 +35,7 @@ Index: Source/web/WebViewImpl.cpp
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -3751,9 +3752,14 @@
@@ -3643,9 +3644,14 @@
updateLayerTreeViewport();
}
@@ -53,9 +53,9 @@ Index: Source/web/WebViewImpl.cpp
void WebViewImpl::startDragging(Frame* frame,
Index: Source/web/WebViewImpl.h
===================================================================
--- Source/web/WebViewImpl.h (revision 159695)
--- Source/web/WebViewImpl.h (revision 160715)
+++ Source/web/WebViewImpl.h (working copy)
@@ -424,7 +424,8 @@
@@ -409,7 +409,8 @@
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
@@ -65,7 +65,7 @@ Index: Source/web/WebViewImpl.h
bool contextMenuAllowed() const
{
@@ -727,6 +728,8 @@
@@ -702,6 +703,8 @@
bool m_contextMenuAllowed;