Attachment 95301 Details for Bug 61711 – Patch

[patch] Patch

bug-61711-20110529183508.patch (text/plain), 1.89 KB, created by Caio Marcelo de Oliveira Filho on 2011-05-29 14:35:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Caio Marcelo de Oliveira Filho

Created: 2011-05-29 14:35:11 PDT

Size: 1.89 KB

patch

obsolete

>Subversion Revision: 87636
>diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
>index 340c23f67bc31141504d1d5446e7b82798a39b96..5b69831b325595247de7bc7d8f05b33d0729e4ce 100644
>--- a/Source/WebKit/qt/ChangeLog
>+++ b/Source/WebKit/qt/ChangeLog
>@@ -1,3 +1,20 @@
>+2011-05-29  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [Qt] Fix unnecessary wait in API autotest tst_QWebFrame::scrollbarsOff
>+        https://bugs.webkit.org/show_bug.cgi?id=61711
>+
>+        The loadFinished() signal was emitted directly inside the call for setHtml, so
>+        the test was waiting the loadFinished() signal with a big timeout. Change this by
>+        a very small timeout and a verification with signal spy.
>+
>+        In practice, setHtml() will either directly call loadFinished() or queue it to
>+        the next event loop run, and test will work for both situations.
>+
>+        * tests/qwebframe/tst_qwebframe.cpp:
>+        (tst_QWebFrame::scrollbarsOff):
>+
> 2011-05-28  Adam Barth  <abarth@webkit.org>
> 
>         Reviewed by Alexey Proskuryakov.
>diff --git a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
>index cadc9d6598747d17698ce78fc9e923dda0a2e834..e7d34908623d3714b8fc2352a629d2b3eaba4b7e 100644
>--- a/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
>+++ b/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
>@@ -3134,8 +3134,10 @@ void tst_QWebFrame::scrollbarsOff()
>                  "</body>");
> 
> 
>+    QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool)));
>     view.setHtml(html);
>-    ::waitForSignal(&view, SIGNAL(loadFinished(bool)));
>+    ::waitForSignal(&view, SIGNAL(loadFinished(bool)), 200);
>+    QCOMPARE(loadSpy.count(), 1);
> 
>     mainFrame->evaluateJavaScript("checkScrollbar();");
>     QCOMPARE(mainFrame->documentElement().findAll("span").at(0).toPlainText(), QString("SUCCESS"));

Actions: View | Formatted Diff | Diff

Attachments on bug 61711: 95301