Update to Chromium revision fc6aaca4 (#406441)

This commit is contained in:
Marshall Greenblatt
2016-07-21 17:21:32 -04:00
parent d92bc1d200
commit 98f59f47fd
79 changed files with 478 additions and 402 deletions

View File

@ -1,8 +1,8 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 6b3b603..0530199 100644
index da897ce..c1d6cf8 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -883,7 +883,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -843,7 +843,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PopupMenu* ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
{
notifyPopupOpeningObservers();
@ -12,7 +12,7 @@ index 6b3b603..0530199 100644
DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 3e92e32..049d5d8 100644
index fcb4d10..dea498b 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -422,6 +422,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, WebPageVisibilityState visibilit
@ -23,7 +23,7 @@ index 3e92e32..049d5d8 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -4067,9 +4068,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -4108,9 +4109,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@ -40,10 +40,10 @@ index 3e92e32..049d5d8 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index 2c3e9a0..7d6a2dc 100644
index 5292560..08e6afe 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -384,7 +384,8 @@ public:
@@ -382,7 +382,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 2c3e9a0..7d6a2dc 100644
bool shouldAutoResize() const
{
@@ -675,6 +676,8 @@ private:
@@ -678,6 +679,8 @@ private:
float m_fakePageScaleAnimationPageScaleFactor;
bool m_fakePageScaleAnimationUseAnchor;
@ -63,10 +63,10 @@ index 2c3e9a0..7d6a2dc 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index fe06749..22895f9 100644
index 4f81bb6..66f1b2d 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -438,6 +438,7 @@ public:
@@ -437,6 +437,7 @@ public:
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);