Changeset 70044 in webkit

Timestamp:

Oct 19, 2010 3:34:56 AM (14 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

[Qt] QtTestBrowser: Prevent calling load() directly from loadFinished() in robot mode.
​https://bugs.webkit.org/show_bug.cgi?id=47809

Reviewed by Andreas Kling.

Connecting a call to load from the loadFinished signal can cause
re-entrance crashes in WebCore. This patch uses a timer to do so,
also giving some time to subsequent frames to finish loading.

• QtTestBrowser/urlloader.cpp:

(UrlLoader::UrlLoader):
(UrlLoader::loadNext):
(UrlLoader::checkIfFinished):
(UrlLoader::frameLoadStarted):
(UrlLoader::frameLoadFinished):

• QtTestBrowser/urlloader.h:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/urlloader.cpp (modified) (5 diffs)
• QtTestBrowser/urlloader.h (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-18  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QtTestBrowser: Prevent calling load() directly from loadFinished() in robot mode.
+        https://bugs.webkit.org/show_bug.cgi?id=47809
+
+        Connecting a call to load from the loadFinished signal can cause
+        re-entrance crashes in WebCore. This patch uses a timer to do so,
+        also giving some time to subsequent frames to finish loading.
+
+        * QtTestBrowser/urlloader.cpp:
+        (UrlLoader::UrlLoader):
+        (UrlLoader::loadNext):
+        (UrlLoader::checkIfFinished):
+        (UrlLoader::frameLoadStarted):
+        (UrlLoader::frameLoadFinished):
+        * QtTestBrowser/urlloader.h:
+
 2010-10-19  Sergio Villar Senín  <svillar@igalia.com>
 

trunk/WebKitTools/QtTestBrowser/urlloader.cpp

@@ -31 +31 @@
 #include <QFile>
 #include <QDebug>
+#include <QWebPage>
 
 UrlLoader::UrlLoader(QWebFrame* frame, const QString& inputFileName, int timeoutSeconds, int extraTimeSeconds)
@@ -36 +37 @@
     , m_stdOut(stdout)
     , m_loaded(0)
+    , m_numFramesLoading(0)
 {
+    m_checkIfFinishedTimer.setInterval(200);
+    m_checkIfFinishedTimer.setSingleShot(true);
+    connect(&m_checkIfFinishedTimer, SIGNAL(timeout()), this, SLOT(checkIfFinished()));
+    // loadStarted and loadFinished on QWebPage is emitted for each frame/sub-frame
+    connect(m_frame->page(), SIGNAL(loadStarted()), this, SLOT(frameLoadStarted()));
+    connect(m_frame->page(), SIGNAL(loadFinished(bool)), this, SLOT(frameLoadFinished()));
+
     if (timeoutSeconds) {
         m_timeoutTimer.setInterval(timeoutSeconds * 1000);
@@ -46 +55 @@
         m_extraTimeTimer.setInterval(extraTimeSeconds * 1000);
         m_extraTimeTimer.setSingleShot(true);
-        connect(frame, SIGNAL(loadFinished(bool)), &m_extraTimeTimer, SLOT(start()));
+        connect(this, SIGNAL(pageLoadFinished()), &m_extraTimeTimer, SLOT(start()));
         connect(&m_extraTimeTimer, SIGNAL(timeout()), this, SLOT(loadNext()));
     } else
-        connect(frame, SIGNAL(loadFinished(bool)), this, SLOT(loadNext()));
+        connect(this, SIGNAL(pageLoadFinished()), this, SLOT(loadNext()));
     loadUrlList(inputFileName);
 }
@@ -57 +66 @@
     m_timeoutTimer.stop();
     m_extraTimeTimer.stop();
+    m_checkIfFinishedTimer.stop();
+    m_numFramesLoading = 0;
     QString qstr;
     if (getUrl(qstr)) {
@@ -67 +78 @@
     } else
         disconnect(m_frame, 0, this, 0);
+}
+
+void UrlLoader::checkIfFinished()
+{
+    if (!m_numFramesLoading)
+        emit pageLoadFinished();
+}
+
+void UrlLoader::frameLoadStarted()
+{
+    ++m_numFramesLoading;
+    m_checkIfFinishedTimer.stop();
+}
+
+void UrlLoader::frameLoadFinished()
+{
+    Q_ASSERT(m_numFramesLoading > 0);
+    --m_numFramesLoading;
+    // Once our frame has finished loading, wait a moment to call loadNext for cases
+    // where a sub-frame starts loading or another frame is loaded through JavaScript.
+    m_checkIfFinishedTimer.start();
 }
 

trunk/WebKitTools/QtTestBrowser/urlloader.h

@@ -45 +45 @@
     void loadNext();
 
+private slots:
+    void checkIfFinished();
+    void frameLoadStarted();
+    void frameLoadFinished();
+
+signals:
+    void pageLoadFinished();
+
 private:
     void loadUrlList(const QString& inputFileName);
@@ -57 +65 @@
     QTimer m_timeoutTimer;
     QTimer m_extraTimeTimer;
+    QTimer m_checkIfFinishedTimer;
+    int m_numFramesLoading;
 };