mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 208345.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1313 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
Index: public/web/WebView.h
|
||||
===================================================================
|
||||
--- public/web/WebView.h (revision 152832)
|
||||
--- public/web/WebView.h (revision 152953)
|
||||
+++ public/web/WebView.h (working copy)
|
||||
@@ -421,6 +421,7 @@
|
||||
|
||||
@@ -12,9 +12,9 @@ Index: public/web/WebView.h
|
||||
// Visited link state --------------------------------------------------
|
||||
Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
|
||||
===================================================================
|
||||
--- Source/WebKit/chromium/src/ChromeClientImpl.cpp (revision 152832)
|
||||
--- Source/WebKit/chromium/src/ChromeClientImpl.cpp (revision 152953)
|
||||
+++ Source/WebKit/chromium/src/ChromeClientImpl.cpp (working copy)
|
||||
@@ -893,7 +893,7 @@
|
||||
@@ -895,7 +895,7 @@
|
||||
|
||||
PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(Frame& frame, PopupMenuClient* client) const
|
||||
{
|
||||
@@ -25,9 +25,9 @@ Index: Source/WebKit/chromium/src/ChromeClientImpl.cpp
|
||||
return adoptRef(new PopupMenuChromium(frame, client));
|
||||
Index: Source/WebKit/chromium/src/WebViewImpl.cpp
|
||||
===================================================================
|
||||
--- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 152832)
|
||||
--- Source/WebKit/chromium/src/WebViewImpl.cpp (revision 152953)
|
||||
+++ Source/WebKit/chromium/src/WebViewImpl.cpp (working copy)
|
||||
@@ -392,6 +392,7 @@
|
||||
@@ -393,6 +393,7 @@
|
||||
, m_fakeDoubleTapPageScaleFactor(0)
|
||||
, m_fakeDoubleTapUseAnchor(false)
|
||||
, m_contextMenuAllowed(false)
|
||||
@@ -35,7 +35,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
|
||||
, m_doingDragAndDrop(false)
|
||||
, m_ignoreInputEvents(false)
|
||||
, m_suppressNextKeypressEvent(false)
|
||||
@@ -3660,9 +3661,14 @@
|
||||
@@ -3676,9 +3677,14 @@
|
||||
updateLayerTreeViewport();
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.cpp
|
||||
void WebViewImpl::setEmulatedTextZoomFactor(float textZoomFactor)
|
||||
Index: Source/WebKit/chromium/src/WebViewImpl.h
|
||||
===================================================================
|
||||
--- Source/WebKit/chromium/src/WebViewImpl.h (revision 152832)
|
||||
--- Source/WebKit/chromium/src/WebViewImpl.h (revision 152953)
|
||||
+++ Source/WebKit/chromium/src/WebViewImpl.h (working copy)
|
||||
@@ -415,7 +415,8 @@
|
||||
|
||||
@@ -65,7 +65,7 @@ Index: Source/WebKit/chromium/src/WebViewImpl.h
|
||||
|
||||
bool contextMenuAllowed() const
|
||||
{
|
||||
@@ -731,6 +732,8 @@
|
||||
@@ -733,6 +734,8 @@
|
||||
|
||||
bool m_contextMenuAllowed;
|
||||
|
||||
|
Reference in New Issue
Block a user