Changeset 79672 in webkit

Timestamp:

Feb 25, 2011 4:48:11 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-02-25 Gopal Raghavan <​gopal.1.raghavan@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] QML WebView inside a Flickable shows checkers pattern at startup
​https://bugs.webkit.org/show_bug.cgi?id=50222.

This patch fixes the checkerboard visible at startup even if preferredWidth and preferredHeight are not set.

• declarative/qdeclarativewebview.cpp: (QDeclarativeWebView::init):
• tests/qdeclarativewebview: Added.
• tests/qdeclarativewebview/qdeclarativewebview.pro: Added.
• tests/qdeclarativewebview/resources: Added.
• tests/qdeclarativewebview/resources/webviewtest.qml: Added.
• tests/qdeclarativewebview/resources/webviewtestdefault.qml: Added.
• tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: Added. (tst_QDeclarativeWebView::initTestCase): (tst_QDeclarativeWebView::cleanupTestCase): (tst_QDeclarativeWebView::init): (tst_QDeclarativeWebView::cleanup): (tst_QDeclarativeWebView::preferredWidthTest): (tst_QDeclarativeWebView::preferredHeightTest): (tst_QDeclarativeWebView::preferredWidthDefaultTest): (tst_QDeclarativeWebView::preferredHeightDefaultTest): (tst_QDeclarativeWebView::checkNoErrors):
• tests/tests.pri:
• tests/tests.pro:

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• declarative/qdeclarativewebview.cpp (modified) (1 diff)
• tests/qdeclarativewebview (added)
• tests/qdeclarativewebview/qdeclarativewebview.pro (added)
• tests/qdeclarativewebview/resources (added)
• tests/qdeclarativewebview/resources/webviewtest.qml (added)
• tests/qdeclarativewebview/resources/webviewtestdefault.qml (added)
• tests/qdeclarativewebview/tst_qdeclarativewebview.cpp (added)
• tests/qdeclarativewebview/tst_qdeclarativewebview.qrc (added)
• tests/tests.pri (modified) (1 diff)
• tests/tests.pro (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-02-25  Gopal Raghavan  <gopal.1.raghavan@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QML WebView inside a Flickable shows checkers pattern at startup
+        https://bugs.webkit.org/show_bug.cgi?id=50222.
+
+        This patch fixes the checkerboard visible at startup even if preferredWidth and preferredHeight are not set.
+
+        * declarative/qdeclarativewebview.cpp:
+        (QDeclarativeWebView::init):
+        * tests/qdeclarativewebview: Added.
+        * tests/qdeclarativewebview/qdeclarativewebview.pro: Added.
+        * tests/qdeclarativewebview/resources: Added.
+        * tests/qdeclarativewebview/resources/webviewtest.qml: Added.
+        * tests/qdeclarativewebview/resources/webviewtestdefault.qml: Added.
+        * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: Added.
+        (tst_QDeclarativeWebView::initTestCase):
+        (tst_QDeclarativeWebView::cleanupTestCase):
+        (tst_QDeclarativeWebView::init):
+        (tst_QDeclarativeWebView::cleanup):
+        (tst_QDeclarativeWebView::preferredWidthTest):
+        (tst_QDeclarativeWebView::preferredHeightTest):
+        (tst_QDeclarativeWebView::preferredWidthDefaultTest):
+        (tst_QDeclarativeWebView::preferredHeightDefaultTest):
+        (tst_QDeclarativeWebView::checkNoErrors):
+        * tests/tests.pri:
+        * tests/tests.pro:
+
 2011-02-24  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/Source/WebKit/qt/declarative/qdeclarativewebview.cpp

@@ -276 +276 @@
     QWebPage* wp = new QDeclarativeWebPage(this);
     setPage(wp);
+    if (!preferredWidth())
+        setPreferredWidth(d->view->preferredWidth());
+    if (!preferredHeight())
+        setPreferredHeight(d->view->preferredHeight());
     connect(d->view, SIGNAL(geometryChanged()), this, SLOT(updateDeclarativeWebViewSize()));
     connect(d->view, SIGNAL(doubleClick(int, int)), this, SIGNAL(doubleClick(int, int)));

trunk/Source/WebKit/qt/tests/tests.pri

@@ -21 +21 @@
 
 include(../../../WebKit.pri)
-QT += testlib network
+QT += testlib network declarative
 
 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR

trunk/Source/WebKit/qt/tests/tests.pro

@@ -1 +1 @@
 
 TEMPLATE = subdirs
-SUBDIRS = qwebframe qwebpage qwebelement qgraphicswebview qwebhistoryinterface qwebview qwebhistory qwebinspector hybridPixmap
+SUBDIRS = qwebframe qwebpage qwebelement qgraphicswebview qwebhistoryinterface qwebview qwebhistory qdeclarativewebview qwebinspector hybridPixmap
 SUBDIRS += benchmarks/painting benchmarks/loading