Changeset 50621 in webkit

Timestamp:

Nov 8, 2009 9:25:31 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

[Qt][DRT] Replace queueScript by queueNonLoadingScript and queueLoadingScript method
​https://bugs.webkit.org/show_bug.cgi?id=31158

Patch by Antonio Gomes <​tonikitoo@webkit.org> on 2009-11-07
Reviewed by Holger Freyther.

By invoking a script queue'd by queueScript(), 'true' was beeing returned
always, which from WorkQueue prospective means that a load has been started
and the queue processing should stop and wait for the load to finish.
Spinning it off into a loading and a non-loading variants was the solution
adopted by Mac's DRT to work around this problem. The former keeps returning
'true' while the later executes the script synchronously and returns 'false'
making it possible to the WorkQueue to proceed right away.

• DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::processWork):
(LayoutTestController::queueLoadingScript):
(LayoutTestController::queueNonLoadingScript):

• DumpRenderTree/qt/LayoutTestControllerQt.h:
• DumpRenderTree/qt/WorkQueueItem.h:

(LoadingScriptItem::LoadingScriptItem):
(LoadingScriptItem::invoke):
(NonLoadingScriptItem::NonLoadingScriptItem):
(NonLoadingScriptItem::invoke):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (1 diff)
• DumpRenderTree/qt/LayoutTestControllerQt.h (modified) (1 diff)
• DumpRenderTree/qt/WorkQueueItem.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-07  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Holger Freyther.
+
+        [Qt][DRT] Replace queueScript by queueNonLoadingScript and queueLoadingScript method
+        https://bugs.webkit.org/show_bug.cgi?id=31158
+
+        By invoking a script queue'd by queueScript(), 'true' was beeing returned
+        always, which from WorkQueue prospective means that a load has been started
+        and the queue processing should stop and wait for the load to finish.
+        Spinning it off into a loading and a non-loading variants was the solution
+        adopted by Mac's DRT to work around this problem. The former keeps returning
+        'true' while the later executes the script synchronously and returns 'false'
+        making it possible to the WorkQueue to proceed right away.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::processWork):
+        (LayoutTestController::queueLoadingScript):
+        (LayoutTestController::queueNonLoadingScript):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+        * DumpRenderTree/qt/WorkQueueItem.h:
+        (LoadingScriptItem::LoadingScriptItem):
+        (LoadingScriptItem::invoke):
+        (NonLoadingScriptItem::NonLoadingScriptItem):
+        (NonLoadingScriptItem::invoke):
+
 2009-11-07  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -187 +187 @@
 }
 
-void LayoutTestController::queueScript(const QString &url)
-{
-    //qDebug() << ">>>queueScript" << url;
-    WorkQueue::shared()->queue(new ScriptItem(url, m_drt->webPage()));
+void LayoutTestController::queueLoadingScript(const QString& script)
+{
+    //qDebug() << ">>>queueLoadingScript" << script;
+    WorkQueue::shared()->queue(new LoadingScriptItem(script, m_drt->webPage()));
+}
+
+void LayoutTestController::queueNonLoadingScript(const QString& script)
+{
+    //qDebug() << ">>>queueNonLoadingScript" << script;
+    WorkQueue::shared()->queue(new NonLoadingScriptItem(script, m_drt->webPage()));
 }
 

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

@@ -94 +94 @@
     void queueLoad(const QString& url, const QString& target = QString());
     void queueReload();
-    void queueScript(const QString& url);
+    void queueLoadingScript(const QString& script);
+    void queueNonLoadingScript(const QString& script);
     void provisionalLoad();
     void setCloseRemainingWindowsWhenComplete(bool = false) {}

trunk/WebKitTools/DumpRenderTree/qt/WorkQueueItem.h

@@ -90 +90 @@
 };
 
+class LoadingScriptItem : public ScriptItem {
+public:
+    LoadingScriptItem(const QString& script, QWebPage* page)
+        : ScriptItem(script, page)
+    {
+    }
+
+    virtual bool invoke() const { return ScriptItem::invoke(); }
+};
+
+class NonLoadingScriptItem : public ScriptItem {
+public:
+    NonLoadingScriptItem(const QString& script, QWebPage* page)
+        : ScriptItem(script, page)
+    {
+    }
+
+    virtual bool invoke() const { ScriptItem::invoke(); return false; }
+};
+
+
 class BackForwardItem : public WorkQueueItem {
 public: