Changeset 53956 in webkit

Timestamp:

Jan 27, 2010 3:32:34 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-27 Diego Gonzalez <​diego.gonzalez@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] DRT Provide worker thread ability to track counters
​https://bugs.webkit.org/show_bug.cgi?id=34221

Implement workerThreadCount() in LayoutTestController of Qt DRT

Tests:
fast/workers/dedicated-worker-lifecycle.html
fast/workers/shared-worker-frame-lifecycle.html
fast/workers/shared-worker-lifecycle.html
fast/workers/worker-lifecycle.html

• platform/qt/Skipped:

2010-01-27 Diego Gonzalez <​diego.gonzalez@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] DRT Provide worker thread ability to track counters
​https://bugs.webkit.org/show_bug.cgi?id=34221

Implement workerThreadCount() in LayoutTestController of Qt DRT

Tests:
fast/workers/dedicated-worker-lifecycle.html
fast/workers/shared-worker-frame-lifecycle.html
fast/workers/shared-worker-lifecycle.html
fast/workers/worker-lifecycle.html

• Api/qwebpage.cpp: (qt_drt_workerThreadCount):

2010-01-27 Diego Gonzalez <​diego.gonzalez@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] DRT Provide worker thread ability to track counters
​https://bugs.webkit.org/show_bug.cgi?id=34221

Implement workerThreadCount() in LayoutTestController of Qt DRT

Tests:
fast/workers/dedicated-worker-lifecycle.html
fast/workers/shared-worker-frame-lifecycle.html
fast/workers/shared-worker-lifecycle.html
fast/workers/worker-lifecycle.html

• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::workerThreadCount):
• DumpRenderTree/qt/LayoutTestControllerQt.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-27  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] DRT Provide worker thread ability to track counters
+        https://bugs.webkit.org/show_bug.cgi?id=34221
+
+        Implement workerThreadCount() in LayoutTestController of Qt DRT
+
+        Tests:
+        fast/workers/dedicated-worker-lifecycle.html
+        fast/workers/shared-worker-frame-lifecycle.html
+        fast/workers/shared-worker-lifecycle.html
+        fast/workers/worker-lifecycle.html
+
+        * platform/qt/Skipped:
+
 2010-01-26  Darin Fisher  <darin@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -4822 +4822 @@
 fast/dom/Geolocation
 
-# Missing DRT ability to track worker thread counts
-fast/workers/dedicated-worker-lifecycle.html
-fast/workers/shared-worker-frame-lifecycle.html
-fast/workers/shared-worker-lifecycle.html
-fast/workers/worker-lifecycle.html
-
 # Missing DRT ability to set accept cookie policy
 http/tests/xmlhttprequest/cross-origin-cookie-storage.html

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -82 +82 @@
 #include "PageGroup.h"
 #include "QWebPageClient.h"
+#include "WorkerThread.h"
 
 #include <QApplication>
@@ -128 +129 @@
     db->setPluginDirectories(paths);
     db->refresh();
+}
+
+int QWEBKIT_EXPORT qt_drt_workerThreadCount()
+{
+#if ENABLE(WORKERS)
+    return WebCore::WorkerThread::workerThreadCount();
+#else
+    return 0;
+#endif
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-01-27  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] DRT Provide worker thread ability to track counters
+        https://bugs.webkit.org/show_bug.cgi?id=34221
+
+        Implement workerThreadCount() in LayoutTestController of Qt DRT
+
+        Tests:
+        fast/workers/dedicated-worker-lifecycle.html
+        fast/workers/shared-worker-frame-lifecycle.html
+        fast/workers/shared-worker-lifecycle.html
+        fast/workers/worker-lifecycle.html
+
+        * Api/qwebpage.cpp:
+        (qt_drt_workerThreadCount):
+
 2010-01-27  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-27  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] DRT Provide worker thread ability to track counters
+        https://bugs.webkit.org/show_bug.cgi?id=34221
+
+        Implement workerThreadCount() in LayoutTestController of Qt DRT
+
+        Tests:
+        fast/workers/dedicated-worker-lifecycle.html
+        fast/workers/shared-worker-frame-lifecycle.html
+        fast/workers/shared-worker-lifecycle.html
+        fast/workers/worker-lifecycle.html
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::workerThreadCount):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2010-01-27  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -48 +48 @@
 extern void qt_drt_whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
 extern QString qt_drt_counterValueForElementById(QWebFrame* qFrame, const QString& id);
+extern int qt_drt_workerThreadCount();
 
 LayoutTestController::LayoutTestController(WebCore::DumpRenderTree* drt)
@@ -433 +434 @@
     qt_drt_setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
 }
+
+int LayoutTestController::workerThreadCount()
+{
+    return qt_drt_workerThreadCount();
+}

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

@@ -53 +53 @@
     Q_OBJECT
     Q_PROPERTY(int webHistoryItemCount READ webHistoryItemCount)
+    Q_PROPERTY(int workerThreadCount READ workerThreadCount)
 public:
     LayoutTestController(WebCore::DumpRenderTree* drt);
@@ -139 +140 @@
     void setUserStyleSheetEnabled(bool enabled);
     void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
+    int workerThreadCount();
 
 private slots: