Update to Chromium revision c78c0ad7 (#363565)

This commit is contained in:
Marshall Greenblatt
2015-12-09 11:10:16 -05:00
parent 535c4fbc30
commit 5dec0c5f57
62 changed files with 534 additions and 478 deletions

View File

@ -1,8 +1,8 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 499991c..b5d6d32 100644
index 5488a95..18c184f 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -809,7 +809,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -821,7 +821,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::openPopupMenu(LocalFrame& frame, HTMLSelectElement& select)
{
notifyPopupOpeningObservers();
@ -12,10 +12,10 @@ index 499991c..b5d6d32 100644
ASSERT(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index c97a89c..6d2fb40 100644
index 3efbcdf..18f0c9e3 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -418,6 +418,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -414,6 +414,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
, m_enableFakePageScaleAnimationForTesting(false)
, m_fakePageScaleAnimationPageScaleFactor(0)
, m_fakePageScaleAnimationUseAnchor(false)
@ -23,7 +23,7 @@ index c97a89c..6d2fb40 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -4018,9 +4019,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -4050,9 +4051,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@ -40,10 +40,10 @@ index c97a89c..6d2fb40 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index 09b718d..a1bc2ffc 100644
index c4453c1..bb6ee4e 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -389,7 +389,8 @@ public:
@@ -395,7 +395,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 09b718d..a1bc2ffc 100644
bool shouldAutoResize() const
{
@@ -670,6 +671,8 @@ private:
@@ -678,6 +679,8 @@ private:
float m_fakePageScaleAnimationPageScaleFactor;
bool m_fakePageScaleAnimationUseAnchor;
@ -63,10 +63,10 @@ index 09b718d..a1bc2ffc 100644
bool m_ignoreInputEvents;
diff --git public/web/WebView.h public/web/WebView.h
index 83d8c13..350bca4 100644
index 843f633..f922327 100644
--- public/web/WebView.h
+++ public/web/WebView.h
@@ -400,6 +400,7 @@ public:
@@ -411,6 +411,7 @@ public:
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void setUseExternalPopupMenus(bool);