mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision 40af916d (#303546).
- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
|
||||
index ee5bdbe..919addf 100644
|
||||
index e0dc3d4..4789bc7 100644
|
||||
--- Source/web/ChromeClientImpl.cpp
|
||||
+++ Source/web/ChromeClientImpl.cpp
|
||||
@@ -728,7 +728,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
|
||||
@@ -724,7 +724,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
|
||||
|
||||
PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::createPopupMenu(LocalFrame& frame, PopupMenuClient* client) const
|
||||
{
|
||||
@ -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 c9ca40a..9cff683 100644
|
||||
index 722513b..a36ca46 100644
|
||||
--- Source/web/WebViewImpl.cpp
|
||||
+++ Source/web/WebViewImpl.cpp
|
||||
@@ -386,6 +386,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
|
||||
@@ -385,6 +385,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
|
||||
, m_fakePageScaleAnimationPageScaleFactor(0)
|
||||
, m_fakePageScaleAnimationUseAnchor(false)
|
||||
, m_contextMenuAllowed(false)
|
||||
@ -23,7 +23,7 @@ index c9ca40a..9cff683 100644
|
||||
, m_doingDragAndDrop(false)
|
||||
, m_ignoreInputEvents(false)
|
||||
, m_compositorDeviceScaleFactorOverride(0)
|
||||
@@ -3919,9 +3920,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged()
|
||||
@@ -3971,9 +3972,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged()
|
||||
m_page->inspectorController().deviceOrPageScaleFactorChanged();
|
||||
}
|
||||
|
||||
@ -40,10 +40,10 @@ index c9ca40a..9cff683 100644
|
||||
|
||||
void WebViewImpl::startDragging(LocalFrame* frame,
|
||||
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
|
||||
index 9bd645b..5da0cae 100644
|
||||
index e3b2985..13a6ee0 100644
|
||||
--- Source/web/WebViewImpl.h
|
||||
+++ Source/web/WebViewImpl.h
|
||||
@@ -372,7 +372,8 @@ public:
|
||||
@@ -373,7 +373,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 9bd645b..5da0cae 100644
|
||||
|
||||
bool contextMenuAllowed() const
|
||||
{
|
||||
@@ -660,6 +661,8 @@ private:
|
||||
@@ -662,6 +663,8 @@ private:
|
||||
|
||||
bool m_contextMenuAllowed;
|
||||
|
||||
|
Reference in New Issue
Block a user