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 267aeeb8 (#297060).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1863 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-10-10 17:54:35 +00:00
parent aa45672d53
commit 57d47f64b5
20 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patch/patches/webkit_popups.patch
View File

@@ -12,10 +12,10 @@ index ee5bdbe..919addf 100644
return adoptRefWillBeNoop(new PopupMenuChromium(frame, client));
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 82d447b..971e3aa 100644
index c9ca40a..9cff683 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -388,6 +388,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -386,6 +386,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
, m_contextMenuAllowed(false)
@@ -23,7 +23,7 @@ index 82d447b..971e3aa 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -3893,9 +3894,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged()
@@ -3919,9 +3920,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged()
m_page->inspectorController().deviceOrPageScaleFactorChanged();
}
@@ -40,10 +40,10 @@ index 82d447b..971e3aa 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index 988352c..81102f1 100644
index 9bd645b..5da0cae 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -368,7 +368,8 @@ public:
@@ -372,7 +372,8 @@ public:
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
@@ -53,7 +53,7 @@ index 988352c..81102f1 100644
bool contextMenuAllowed() const
{
@@ -654,6 +655,8 @@ private:
@@ -660,6 +661,8 @@ private:
bool m_contextMenuAllowed;
@@ -63,10 +63,10 @@ index 988352c..81102f1 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index db4c090..89ae86d 100644
index 8ff8487..f65d350 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -412,6 +412,7 @@ public:
@@ -405,6 +405,7 @@ public:
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);