Imported WebKit commit f2da9451cbccb8b7921d55483aa0bc656ff9cf53 (http://svn.webkit.org/repository/webkit/trunk@119269)

New snapshot that includes fix for using -Werror only in developer builds

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp
index e0a441c0e..13decd7d0 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp
@@ -122,47 +122,47 @@ QVariant QWebKitTest::contentsScale() const
 {
     if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
         return viewport->currentCSSScale();
-    return QVariant();
+    return 1.0;
 }
 
 QVariant QWebKitTest::devicePixelRatio() const
 {
     if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
         return viewport->m_devicePixelRatio;
-    return QVariant();
+    return 1.0;
 }
 
 QVariant QWebKitTest::initialScale() const
 {
     if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
         return viewport->m_rawAttributes.initialScale;
-    return QVariant();
+    return 1.0;
 }
 
 QVariant QWebKitTest::minimumScale() const
 {
     if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
         return viewport->m_minimumScale;
-    return QVariant();
+    return 1.0;
 }
 
 QVariant QWebKitTest::maximumScale() const
 {
     if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
         return viewport->m_maximumScale;
-    return QVariant();
+    return 1.0;
 }
 
 QVariant QWebKitTest::isScalable() const
 {
     if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
         return !!viewport->m_rawAttributes.userScalable;
-    return QVariant();
+    return false;
 }
 
 QVariant QWebKitTest::layoutSize() const
 {
     if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
         return QSizeF(viewport->m_rawAttributes.layoutSize);
-    return QVariant();
+    return QSizeF();
 }