Update to Chromium version 45.0.2454.26

This commit is contained in:
Marshall Greenblatt
2015-08-11 18:08:35 -04:00
parent 33f860863e
commit e979611ea6
7 changed files with 42 additions and 57 deletions

View File

@@ -1,5 +1,5 @@
diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
index 58e8166..23c0cea 100644
index 690a8c2..4c08e15 100644
--- Source/web/ChromeClientImpl.cpp
+++ Source/web/ChromeClientImpl.cpp
@@ -774,7 +774,7 @@ bool ChromeClientImpl::hasOpenedPopup() const
@@ -12,7 +12,7 @@ index 58e8166..23c0cea 100644
ASSERT(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
index 1f8413a..efeff15 100644
index a21d33a..27bc146 100644
--- Source/web/WebViewImpl.cpp
+++ Source/web/WebViewImpl.cpp
@@ -397,6 +397,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
@@ -23,7 +23,7 @@ index 1f8413a..efeff15 100644
, m_doingDragAndDrop(false)
, m_ignoreInputEvents(false)
, m_compositorDeviceScaleFactorOverride(0)
@@ -3925,9 +3926,14 @@ void WebViewImpl::pageScaleFactorChanged()
@@ -3932,9 +3933,14 @@ void WebViewImpl::pageScaleFactorChanged()
m_client->pageScaleFactorChanged();
}
@@ -40,7 +40,7 @@ index 1f8413a..efeff15 100644
void WebViewImpl::startDragging(LocalFrame* frame,
diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
index a3ece01..60adce4 100644
index 7f2884d..1a5d3b2 100644
--- Source/web/WebViewImpl.h
+++ Source/web/WebViewImpl.h
@@ -389,7 +389,8 @@ public:
@@ -53,7 +53,7 @@ index a3ece01..60adce4 100644
bool contextMenuAllowed() const
{
@@ -675,6 +676,8 @@ private:
@@ -677,6 +678,8 @@ private:
bool m_contextMenuAllowed;