Changeset 84475 in webkit


Ignore:
Timestamp:
Apr 21, 2011 12:29:30 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-21 Caio Marcelo de Oliveira Filho <​caio.oliveira@openbossa.org>

Reviewed by Csaba Osztrogonác.

[Qt] REGRESSION(84057): It made 4 API tests fail
​https://bugs.webkit.org/show_bug.cgi?id=58848

After MIME sniffing support was added, some autotests are failing because
the sniffer doesn't recognize our HTML pages.

This fixes tst_QWebPage::backActionUpdate(), tst_QWebPage::errorPageExtensionInFrameset()
and tst_QWebFrame::horizontalScrollAfterBack().

  • tests/qwebframe/resources/testiframe.html:
  • tests/qwebframe/resources/testiframe2.html: Remove spurious </html> in beginning of the document.
  • tests/qwebpage/resources/framedindex.html:
  • tests/qwebpage/resources/index.html: Add <html> (and </html>) tags, <frameset> is not recognized by the sniffer as a possible starting tag for HTML document.
  • tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::errorPageExtensionInFrameset): Verify if we do have a main frame and the main frame has the children frames we expect. This will avoid crashing if for some reason children frames are not loaded.
Location:
trunk/Source/WebKit/qt
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/qt/ChangeLog

    r84472 r84475  
     12011-04-21  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
     2
     3        Reviewed by Csaba Osztrogonác.
     4
     5        [Qt] REGRESSION(84057): It made 4 API tests fail
     6        https://bugs.webkit.org/show_bug.cgi?id=58848
     7
     8        After MIME sniffing support was added, some autotests are failing because
     9        the sniffer doesn't recognize our HTML pages.
     10
     11        This fixes tst_QWebPage::backActionUpdate(), tst_QWebPage::errorPageExtensionInFrameset()
     12        and tst_QWebFrame::horizontalScrollAfterBack().
     13
     14        * tests/qwebframe/resources/testiframe.html:
     15        * tests/qwebframe/resources/testiframe2.html:
     16        Remove spurious </html> in beginning of the document.
     17
     18        * tests/qwebpage/resources/framedindex.html:
     19        * tests/qwebpage/resources/index.html:
     20        Add <html> (and </html>) tags, <frameset> is not recognized by the sniffer as a
     21        possible starting tag for HTML document.
     22
     23        * tests/qwebpage/tst_qwebpage.cpp:
     24        (tst_QWebPage::errorPageExtensionInFrameset):
     25        Verify if we do have a main frame and the main frame has the children frames we
     26        expect. This will avoid crashing if for some reason children frames are not
     27        loaded.
     28
    1292011-04-20  Dominic Cooney  <dominicc@chromium.org>
    230

  • trunk/Source/WebKit/qt/tests/qwebframe/resources/testiframe.html

    r52444 r84475  
    1 </html>
    21<html>
    32<head>

  • trunk/Source/WebKit/qt/tests/qwebframe/resources/testiframe2.html

    r52444 r84475  
    1 </html>
    21<html>
    32<head>

  • trunk/Source/WebKit/qt/tests/qwebpage/resources/framedindex.html

    r79996 r84475  
     1<html>
    12<frameset cols="25%,75%">
    23   <frame src="frame_c.html" name="frame_c">
    34   <frame src="frame_b.html" name="frame_b">
    45</frameset>
     6</html>

  • trunk/Source/WebKit/qt/tests/qwebpage/resources/index.html

    r52444 r84475  
     1<html>
    12<frameset cols="25%,75%">
    23   <frame src="frame_a.html" name="frame_a">
    34   <frame src="frame_b.html" name="frame_b">
    45</frameset>
     6</html>

  • trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

    r84171 r84475  
    24132413    QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
    24142414    QTRY_COMPARE(spyLoadFinished.count(), 1);
     2415    QCOMPARE(page->mainFrame()->childFrames().count(), 2);
    24152416    QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString("error"));
    24162417
Note: See TracChangeset for help on using the changeset viewer.