Changeset 87767 in webkit


Ignore:
Timestamp:
May 31, 2011 6:47:23 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-31 Rafael Brandao <​rafael.lobo@openbossa.org>

Reviewed by Andreas Kling.

[Qt] tst_QWebFrame::render() failing
​https://bugs.webkit.org/show_bug.cgi?id=60893

Due a problem on QPicture (​http://bugreports.qt.nokia.com/browse/QTBUG-19496),
this test was calculating the final geometry incorrectly. As the order between
a translate and a draw operation could be relevant for it, but not for the
final rendered result, they were changed on ScrollbarThemeQt::paint.

  • platform/qt/ScrollbarThemeQt.cpp: (WebCore::ScrollbarThemeQt::paint):

2011-05-31 Rafael Brandao <​rafael.lobo@openbossa.org>

Reviewed by Andreas Kling.

[Qt] tst_QWebFrame::render() failing
​https://bugs.webkit.org/show_bug.cgi?id=60893

The test was expecting the frame contents to be already loaded
before rendering it into a QPicture. Renamed the test to fit
its real purpose more accordingly.

  • tests/qwebframe/tst_qwebframe.cpp: (tst_QWebFrame::renderGeometry):
Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r87762 r87767  
     12011-05-31  Rafael Brandao  <rafael.lobo@openbossa.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] tst_QWebFrame::render() failing
     6        https://bugs.webkit.org/show_bug.cgi?id=60893
     7
     8        Due a problem on QPicture (http://bugreports.qt.nokia.com/browse/QTBUG-19496),
     9        this test was calculating the final geometry incorrectly. As the order between
     10        a translate and a draw operation could be relevant for it, but not for the
     11        final rendered result, they were changed on ScrollbarThemeQt::paint.
     12
     13        * platform/qt/ScrollbarThemeQt.cpp:
     14        (WebCore::ScrollbarThemeQt::paint):
     15
    1162011-05-27  Adrienne Walker  <enne@google.com>
    217

  • trunk/Source/WebCore/platform/qt/ScrollbarThemeQt.cpp

    r87290 r87767  
    164164#endif
    165165    {
     166        // The QStyle expects the background to be already filled.
     167        p.painter->fillRect(opt->rect, opt->palette.background());
     168
    166169        const QPoint topLeft = opt->rect.topLeft();
    167170        p.painter->translate(topLeft);
    168171        opt->rect.moveTo(QPoint(0, 0));
    169 
    170         // The QStyle expects the background to be already filled.
    171         p.painter->fillRect(opt->rect, opt->palette.background());
    172 
    173172        p.drawComplexControl(QStyle::CC_ScrollBar, *opt);
    174173        opt->rect.moveTo(topLeft);

  • trunk/Source/WebKit/qt/ChangeLog

    r87695 r87767  
     12011-05-31  Rafael Brandao  <rafael.lobo@openbossa.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] tst_QWebFrame::render() failing
     6        https://bugs.webkit.org/show_bug.cgi?id=60893
     7       
     8        The test was expecting the frame contents to be already loaded
     9        before rendering it into a QPicture. Renamed the test to fit
     10        its real purpose more accordingly.
     11
     12        * tests/qwebframe/tst_qwebframe.cpp:
     13        (tst_QWebFrame::renderGeometry):
     14
    1152011-05-30  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
    216

  • trunk/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

    r87695 r87767  
    638638    void baseUrl();
    639639    void hasSetFocus();
    640     void render();
     640    void renderGeometry();
    641641    void renderHints();
    642642    void scrollPosition();
    … …  
    28822882}
    28832883
    2884 void tst_QWebFrame::render()
     2884void tst_QWebFrame::renderGeometry()
    28852885{
    28862886    QString html("<html>" \
    … …  
    28982898    QString innerHtml("<body style='margin: 0px;'><img src='qrc:/image.png'/></body>");
    28992899    frame->setHtml(innerHtml);
     2900    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
    29002901
    29012902    QPicture picture;
Note: See TracChangeset for help on using the changeset viewer.