Title: [119218] trunk/Source/WebKit2
- Revision
- 119218
- Author
- [email protected]
- Date
- 2012-06-01 05:26:49 -0700 (Fri, 01 Jun 2012)
Log Message
[Qt][W2] Qml Error in ViewportInfoItem.qml in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=87999
Patch by Dinu Jacob <[email protected]> on 2012-06-01
Reviewed by Kenneth Rohde Christiansen.
Return default viewport attributes rather than invalid QVariant.
* UIProcess/API/qt/qwebkittest.cpp:
(QWebKitTest::contentsScale):
(QWebKitTest::devicePixelRatio):
(QWebKitTest::initialScale):
(QWebKitTest::minimumScale):
(QWebKitTest::maximumScale):
(QWebKitTest::isScalable):
(QWebKitTest::layoutSize):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (119217 => 119218)
--- trunk/Source/WebKit2/ChangeLog 2012-06-01 12:25:31 UTC (rev 119217)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-01 12:26:49 UTC (rev 119218)
@@ -1,3 +1,21 @@
+2012-06-01 Dinu Jacob <[email protected]>
+
+ [Qt][W2] Qml Error in ViewportInfoItem.qml in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=87999
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Return default viewport attributes rather than invalid QVariant.
+
+ * UIProcess/API/qt/qwebkittest.cpp:
+ (QWebKitTest::contentsScale):
+ (QWebKitTest::devicePixelRatio):
+ (QWebKitTest::initialScale):
+ (QWebKitTest::minimumScale):
+ (QWebKitTest::maximumScale):
+ (QWebKitTest::isScalable):
+ (QWebKitTest::layoutSize):
+
2012-05-31 Kenneth Rohde Christiansen <[email protected]>
[Qt] Clean up our viewport handling mess
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp (119217 => 119218)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp 2012-06-01 12:25:31 UTC (rev 119217)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp 2012-06-01 12:26:49 UTC (rev 119218)
@@ -122,47 +122,47 @@
{
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 true;
}
QVariant QWebKitTest::layoutSize() const
{
if (QtViewportInteractionEngine* viewport = m_webViewPrivate->viewportInteractionEngine())
return QSizeF(viewport->m_rawAttributes.layoutSize);
- return QVariant();
+ return QSizeF();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
