Changeset 68457 in webkit

Timestamp:

Sep 27, 2010 5:31:09 PM (14 years ago)

Author:

kenneth@webkit.org

Message:

[Qt] Remove setDeviceSize methods
​https://bugs.webkit.org/show_bug.cgi?id=46347

Reviewed by Antonio Gomes.

Remove our setDeviceHeight() API and obtain it automatically from the
system. Also for testing purposes, make it possible to override the
values via two newly introduced environment variables.

• Api/qgraphicswebview.cpp:
• Api/qgraphicswebview.h:
• Api/qwebpage.cpp:

(getintenv):
(queryDeviceSizeForScreenContainingWidget):
(QWebPage::viewportConfigurationForSize):

• WebCoreSupport/PageClientQt.cpp:

(WebCore::PageClientQGraphicsWidget::windowRect):

• symbian/eabi/QtWebKitu.def:

Location:

trunk/WebKit/qt

Files:

• Api/qgraphicswebview.cpp (modified) (2 diffs)
• Api/qgraphicswebview.h (modified) (2 diffs)
• Api/qwebpage.cpp (modified) (4 diffs)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/PageClientQt.cpp (modified) (1 diff)
• symbian/eabi/QtWebKitu.def (modified) (2 diffs)

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -76 +76 @@
     QWebPage* page;
     bool resizesToContents;
-    QSize deviceSize;
 
     // Just a convenience to avoid using page->client->overlay always
@@ -556 +555 @@
 
 /*!
-    \property QGraphicsWebView::deviceSize
-    \brief the size of the device using the web view
-
-    The device size is used by the DOM window object methods
-    otherHeight(), otherWidth() as well as a page for the viewport
-    meta tag attributes device-width and device-height.
-*/
-void QGraphicsWebView::setDeviceSize(const QSize& size)
-{
-    d->deviceSize = size;
-}
-
-QSize QGraphicsWebView::deviceSize() const
-{
-    return d->deviceSize;
-}
-
-/*!
     \property QGraphicsWebView::zoomFactor
     \brief the zoom factor for the view

trunk/WebKit/qt/Api/qgraphicswebview.h

@@ -42 +42 @@
     Q_PROPERTY(QIcon icon READ icon NOTIFY iconChanged)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
-    Q_PROPERTY(QSize deviceSize READ deviceSize WRITE setDeviceSize)
 
     Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
@@ -65 +64 @@
     qreal zoomFactor() const;
     void setZoomFactor(qreal);
-
-    QSize deviceSize() const;
-    void setDeviceSize(const QSize&);
 
     bool isModified() const;

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -22 +22 @@
 #include "config.h"
 #include "qwebpage.h"
+
 #include "qwebview.h"
 #include "qwebframe.h"
@@ -95 +96 @@
 #include <QBitArray>
 #include <QDebug>
+#include <QDesktopWidget>
 #include <QDragEnterEvent>
 #include <QDragLeaveEvent>
@@ -2339 +2341 @@
 }
 
+static int getintenv(const char* variable)
+{
+    bool ok;
+    int value = qgetenv(variable).toInt(&ok);
+    return (ok) ? value : -1;
+}
+
+static QSize queryDeviceSizeForScreenContainingWidget(const QWidget* widget)
+{
+    QDesktopWidget* desktop = QApplication::desktop();
+    if (!desktop)
+        return QSize();
+
+    QSize size;
+
+    if (widget) {
+        // Returns the available geometry of the screen which contains widget.
+        // NOTE: this must be the the full screen size including any fixed status areas etc.
+        size = desktop->availableGeometry(widget).size();
+    } else
+        size = desktop->availableGeometry().size();
+
+    // This must be in portrait mode, adjust if not.
+    if (size.width() > size.height()) {
+        int width = size.width();
+        size.setWidth(size.height());
+        size.setHeight(width);
+    }
+
+    return size;
+}
+
+/*!
+    Computes the optimal viewport configuration given the \a availableSize, when
+    user interface components are disregarded.
+
+    The configuration is also dependent on the device screen size which is obtained
+    automatically. For testing purposes the size can be overridden by setting two
+    environment variables QTWEBKIT_DEVICE_WIDTH and QTWEBKIT_DEVICE_HEIGHT, which
+    both needs to be set.
+*/
+
 QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize(QSize availableSize) const
 {
@@ -2344 +2388 @@
     static int deviceDPI = 160;
 
-    FloatRect rect = d->page->chrome()->windowRect();
-
-    int deviceWidth = rect.width();
-    int deviceHeight = rect.height();
-
-    WebCore::ViewportConfiguration conf = WebCore::findConfigurationForViewportData(mainFrame()->d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
-
     ViewportConfiguration result;
+
+    int deviceWidth = getintenv("QTWEBKIT_DEVICE_WIDTH");
+    int deviceHeight = getintenv("QTWEBKIT_DEVICE_HEIGHT");
+
+    // Both environment variables need to be set - or they will be ignored.
+    if (deviceWidth < 0 && deviceHeight < 0) {
+        QSize size = queryDeviceSizeForScreenContainingWidget((d->client) ? d->client->ownerWidget() : 0);
+        deviceWidth = size.width();
+        deviceHeight = size.height();
+    }
+
+    WebCore::ViewportConfiguration conf = WebCore::findConfigurationForViewportData(mainFrame()->d->viewportArguments(),
+            desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
 
     result.m_isValid = true;

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-09-27  Kenneth Rohde Christiansen  <kenneth.christiansen@openbossa.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Remove setDeviceSize methods
+        https://bugs.webkit.org/show_bug.cgi?id=46347
+
+        Remove our setDeviceHeight() API and obtain it automatically from the
+        system. Also for testing purposes, make it possible to override the
+        values via two newly introduced environment variables.
+
+        * Api/qgraphicswebview.cpp:
+        * Api/qgraphicswebview.h:
+        * Api/qwebpage.cpp:
+        (getintenv):
+        (queryDeviceSizeForScreenContainingWidget):
+        (QWebPage::viewportConfigurationForSize):
+        * WebCoreSupport/PageClientQt.cpp:
+        (WebCore::PageClientQGraphicsWidget::windowRect):
+        * symbian/eabi/QtWebKitu.def:
+
 2010-09-27  Girish Ramakrishnan  <girish@forwardbias.in>
 

trunk/WebKit/qt/WebCoreSupport/PageClientQt.cpp

@@ -319 +319 @@
 QRectF PageClientQGraphicsWidget::windowRect() const
 {
-    if (!view->deviceSize().isEmpty())
-        return QRectF(QRect(QPoint(0, 0), view->deviceSize()));
-
     if (!view->scene())
         return QRectF();

trunk/WebKit/qt/symbian/eabi/QtWebKitu.def

@@ -800 +800 @@
         _ZN8QWebPage23viewportChangeRequestedERKNS_13ViewportHintsE @ 799 NONAME ABSENT
         _ZNK15QWebScriptWorld5worldEv @ 800 NONAME
-        _ZN16QGraphicsWebView13setDeviceSizeERK5QSize @ 801 NONAME
         _ZN23DumpRenderTreeSupportQt12pagePropertyEP9QWebFrameRK7QStringi @ 802 NONAME
         _ZN23DumpRenderTreeSupportQt16isPageBoxVisibleEP9QWebFramei @ 803 NONAME
@@ -812 +811 @@
         _ZN8QWebPage25requestPermissionFromUserEP9QWebFrameNS_16PermissionDomainE @ 811 NONAME
         _ZN8QWebPage27cancelRequestsForPermissionEP9QWebFrameNS_16PermissionDomainE @ 812 NONAME
-        _ZNK16QGraphicsWebView10deviceSizeEv @ 813 NONAME
         _ZN23DumpRenderTreeSupportQt14viewportAsTextEP8QWebPageRK5QSize @ 814 NONAME
         _ZN23DumpRenderTreeSupportQt32simulateDesktopNotificationClickERK7QString @ 815 NONAME