Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 8 insertions, 8 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp
index 13decd7d0..0930708d4 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "qwebkittest_p.h"
 
-#include "QtViewportInteractionEngine.h"
+#include "QtViewportHandler.h"
 #include "qquickwebview_p_p.h"
 #include "qwindowsysteminterface_qpa.h"
 #include <QMutableListIterator>
@@ -120,49 +120,49 @@ QSize QWebKitTest::contentsSize() const
 
 QVariant QWebKitTest::contentsScale() const
 {
-    if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
+    if (QtViewportHandler* viewport = m_webViewPrivate->viewportHandler())
         return viewport->currentCSSScale();
     return 1.0;
 }
 
 QVariant QWebKitTest::devicePixelRatio() const
 {
-    if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
+    if (QtViewportHandler* viewport = m_webViewPrivate->viewportHandler())
         return viewport->m_devicePixelRatio;
     return 1.0;
 }
 
 QVariant QWebKitTest::initialScale() const
 {
-    if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
+    if (QtViewportHandler* viewport = m_webViewPrivate->viewportHandler())
         return viewport->m_rawAttributes.initialScale;
     return 1.0;
 }
 
 QVariant QWebKitTest::minimumScale() const
 {
-    if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
+    if (QtViewportHandler* viewport = m_webViewPrivate->viewportHandler())
         return viewport->m_minimumScale;
     return 1.0;
 }
 
 QVariant QWebKitTest::maximumScale() const
 {
-    if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
+    if (QtViewportHandler* viewport = m_webViewPrivate->viewportHandler())
         return viewport->m_maximumScale;
     return 1.0;
 }
 
 QVariant QWebKitTest::isScalable() const
 {
-    if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
+    if (QtViewportHandler* viewport = m_webViewPrivate->viewportHandler())
         return !!viewport->m_rawAttributes.userScalable;
     return false;
 }
 
 QVariant QWebKitTest::layoutSize() const
 {
-    if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
+    if (QtViewportHandler* viewport = m_webViewPrivate->viewportHandler())
         return QSizeF(viewport->m_rawAttributes.layoutSize);
     return QSizeF();
 }