Changeset 70777 in webkit

Timestamp:

Oct 28, 2010 8:49:08 AM (14 years ago)

Author:

kenneth@webkit.org

Message:

2010-10-28 Kenneth Rohde Christiansen <​kenneth@webkit.org>

Reviewed by Andreas Kling.

Make Qt viewportAttributesForSize not assert on (0, 0) size
​https://bugs.webkit.org/show_bug.cgi?id=48524

We now return an invalid (isValid() == false) ViewportAttributes
instance when the supplied size is (0, 0).

• Api/qwebpage.cpp: (QWebPage::viewportAttributesForSize):

2010-10-28 Kenneth Rohde Christiansen <​kenneth@webkit.org>

Reviewed by Andreas Kling.

Make Qt viewportAttributesForSize not assert on (0, 0) size
​https://bugs.webkit.org/show_bug.cgi?id=48524

We now return an invalid (isValid() == false) ViewportAttributes
instance when the supplied size is (0, 0).

• UIProcess/API/qt/qwkpage.cpp: (QWKPage::viewportAttributesForSize):

Location:

trunk

Files:

• WebKit/qt/Api/qwebpage.cpp (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/qt/qwkpage.cpp (modified) (2 diffs)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -2294 +2294 @@
     environment variables QTWEBKIT_DEVICE_WIDTH and QTWEBKIT_DEVICE_HEIGHT, which
     both needs to be set.
+
+    An invalid instance will be returned in the case an empty size is passed to the
+    method.
 */
 
@@ -2302 +2305 @@
 
     ViewportAttributes result;
+
+     if (availableSize.isEmpty())
+         return result; // Returns an invalid instance.
 
     int deviceWidth = getintenv("QTWEBKIT_DEVICE_WIDTH");

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-10-28  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Make Qt viewportAttributesForSize not assert on (0, 0) size
+        https://bugs.webkit.org/show_bug.cgi?id=48524
+
+        We now return an invalid (isValid() == false) ViewportAttributes
+        instance when the supplied size is (0, 0).
+
+        * Api/qwebpage.cpp:
+        (QWebPage::viewportAttributesForSize):
+
 2010-10-27  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-28  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Make Qt viewportAttributesForSize not assert on (0, 0) size
+        https://bugs.webkit.org/show_bug.cgi?id=48524
+
+        We now return an invalid (isValid() == false) ViewportAttributes
+        instance when the supplied size is (0, 0).
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPage::viewportAttributesForSize):
+
 2010-10-28  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/WebKit2/UIProcess/API/qt/qwkpage.cpp

@@ -385 +385 @@
     static int deviceDPI = 160;
 
+    ViewportAttributes result;
+
+     if (availableSize.isEmpty())
+         return result; // Returns an invalid instance.
+
     // FIXME: Add a way to get these data via the platform plugin and fall back
     // to the size of the view.
@@ -391 +396 @@
 
     WebCore::ViewportAttributes conf = WebCore::computeViewportAttributes(d->viewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
-
-    ViewportAttributes result;
 
     result.m_isValid = true;