Update to Chromium revision 68623971 (#403382)

This commit is contained in:
Marshall Greenblatt
2016-07-06 15:34:09 -04:00
parent d0a2e217a0
commit a60bb077a3
55 changed files with 437 additions and 283 deletions

View File

@@ -1,8 +1,8 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index f3d796c..bc0ee90 100644
index 6b3b603..0530199 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -881,7 +881,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -883,7 +883,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
{
notifyPopupOpeningObservers();
@@ -12,10 +12,10 @@ index f3d796c..bc0ee90 100644
DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 3df57d6..07c2307 100644
index 3e92e32..049d5d8 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -419,6 +419,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -422,6 +422,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, WebPageVisibilityState visibilit
, m_enableFakePageScaleAnimationForTesting(false)
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
@@ -23,7 +23,7 @@ index 3df57d6..07c2307 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -4110,9 +4111,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -4067,9 +4068,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@@ -40,10 +40,10 @@ index 3df57d6..07c2307 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index 716e264..9726e8f 100644
index 2c3e9a0..7d6a2dc 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -387,7 +387,8 @@ public:
@@ -384,7 +384,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 716e264..9726e8f 100644
bool shouldAutoResize() const
{
@@ -673,6 +674,8 @@ private:
@@ -675,6 +676,8 @@ private:
float m_fakePageScaleAnimationPageScaleFactor;
bool m_fakePageScaleAnimationUseAnchor;
@@ -63,10 +63,10 @@ index 716e264..9726e8f 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index bca14ae..10b7ff6 100644
index fe06749..22895f9 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -445,6 +445,7 @@ public:
@@ -438,6 +438,7 @@ public:
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);