2011-02-25 Gopal Raghavan <gopal.1.raghavan@nokia.com>
authorAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Thu, 3 Mar 2011 18:49:39 +0000 (15:49 -0300)
committerAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Thu, 3 Mar 2011 18:49:39 +0000 (15:49 -0300)
commitc31f2f45391daa3c786ab30465ef30f7c9fe0f0f
tree2fad20a3e1e55e333a70b03af2c74ec148c57833
parente0785cacee0dbe739986f6bf99314dcde4e0c43c
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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@79672 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Conflicts:

Source/WebKit/qt/ChangeLog
Source/WebKit/qt/declarative/qdeclarativewebview.cpp
Source/WebKit/qt/declarative/qdeclarativewebview.cpp [new file with mode: 0644]
WebKit/qt/ChangeLog
WebKit/qt/declarative/qdeclarativewebview.cpp
WebKit/qt/tests/qdeclarativewebview/qdeclarativewebview.pro [new file with mode: 0644]
WebKit/qt/tests/qdeclarativewebview/resources/webviewtest.qml [new file with mode: 0644]
WebKit/qt/tests/qdeclarativewebview/resources/webviewtestdefault.qml [new file with mode: 0644]
WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp [new file with mode: 0644]
WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.qrc [new file with mode: 0644]
WebKit/qt/tests/tests.pri
WebKit/qt/tests/tests.pro