Changeset 90181 in webkit


Ignore:
Timestamp:
Jun 30, 2011 4:30:18 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-30 Rafael Brandao <​rafael.lobo@openbossa.org>

Reviewed by Benjamin Poulain.

[Qt] Fix tst_QWebFrame::renderGeometry() API test
​https://bugs.webkit.org/show_bug.cgi?id=63236

This test required a security origin with granted permission to request local resources.
By default, only local files can load local resources. So modified baseUrl to be a local file.

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

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/qt/ChangeLog

    r90178 r90181  
     12011-06-30  Rafael Brandao  <rafael.lobo@openbossa.org>
     2
     3        Reviewed by Benjamin Poulain.
     4
     5        [Qt] Fix tst_QWebFrame::renderGeometry() API test
     6        https://bugs.webkit.org/show_bug.cgi?id=63236
     7       
     8        This test required a security origin with granted permission to request local resources.
     9        By default, only local files can load local resources. So modified baseUrl to be a local file.
     10
     11        * tests/qwebframe/tst_qwebframe.cpp:
     12        (tst_QWebFrame::renderGeometry):
     13
    1142011-06-27  Diego Gonzalez  <diegohcg@webkit.org>
    215

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

    r89830 r90181  
    28992899    QWebFrame *frame = frames.at(0);
    29002900    QString innerHtml("<body style='margin: 0px;'><img src='qrc:/image.png'/></body>");
    2901     frame->setHtml(innerHtml);
     2901
     2902    // By default, only security origins of local files can load local resources.
     2903    // So we should specify baseUrl to be a local file in order to get a proper origin.
     2904    frame->setHtml(innerHtml, QUrl("file:///path/to/file"));
    29022905    waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
    29032906
    … …  
    29122915    painter1.end();
    29132916
    2914     QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63236", Continue);
    29152917    QCOMPARE(size.width(), picture.boundingRect().width() + frame->scrollBarGeometry(Qt::Vertical).width());
    2916     QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63236", Continue);
    29172918    QCOMPARE(size.height(), picture.boundingRect().height() + frame->scrollBarGeometry(Qt::Horizontal).height());
    29182919
    … …  
    29222923    painter2.end();
    29232924
    2924     QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63236", Continue);
    29252925    QCOMPARE(size.width(), picture.boundingRect().width());   // width: 100px
    2926     QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63236", Continue);
    29272926    QCOMPARE(size.height(), picture.boundingRect().height()); // height: 100px
    29282927}
Note: See TracChangeset for help on using the changeset viewer.