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 220934.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1427 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-09-03 21:48:12 +00:00
parent 9e50918a30
commit 97dd8beb4f
18 changed files with 59 additions and 49 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 156144)
--- public/web/WebView.h (revision 157102)
+++ public/web/WebView.h (working copy)
@@ -439,6 +439,7 @@
@@ -444,6 +444,7 @@
// Sets whether select popup menus should be rendered by the browser.
WEBKIT_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 156144)
--- Source/web/ChromeClientImpl.cpp (revision 157102)
+++ Source/web/ChromeClientImpl.cpp (working copy)
@@ -880,7 +880,7 @@
@@ -887,7 +887,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 156144)
--- Source/web/WebViewImpl.cpp (revision 157102)
+++ Source/web/WebViewImpl.cpp (working copy)
@@ -393,6 +393,7 @@
@@ -394,6 +394,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_suppressNextKeypressEvent(false)
@@ -3636,9 +3637,14 @@
@@ -3671,9 +3672,14 @@
updateLayerTreeViewport();
}
@@ -50,10 +50,10 @@ Index: Source/web/WebViewImpl.cpp
+ return m_shouldUseExternalPopupMenus;
}
void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor)
void WebViewImpl::startDragging(Frame* frame,
Index: Source/web/WebViewImpl.h
===================================================================
--- Source/web/WebViewImpl.h (revision 156144)
--- Source/web/WebViewImpl.h (revision 157102)
+++ Source/web/WebViewImpl.h (working copy)
@@ -422,7 +422,8 @@
@@ -65,7 +65,7 @@ Index: Source/web/WebViewImpl.h
bool contextMenuAllowed() const
{
@@ -723,6 +724,8 @@
@@ -720,6 +721,8 @@
bool m_contextMenuAllowed;