[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
eric at webkit.org
eric at webkit.org
Thu Feb 4 21:29:57 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 348a2d429f7dc4e3ae865b71a30cb6cf68278f69
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 27 23:32:34 2010 +0000
2010-01-27 Diego Gonzalez <diego.gonzalez at 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 at 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 at 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53956 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4791d4c..0e4a29d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-27 Diego Gonzalez <diego.gonzalez at 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 at chromium.org>
Reviewed by Brady Eidson and David Levin.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index f50650c..58137f5 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -4821,12 +4821,6 @@ loader/go-back-to-different-window-size.html
# This port doesn't support Geolocation.
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
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index e50943c..7e3b084 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -81,6 +81,7 @@
#include "runtime/InitializeThreading.h"
#include "PageGroup.h"
#include "QWebPageClient.h"
+#include "WorkerThread.h"
#include <QApplication>
#include <QBasicTimer>
@@ -129,6 +130,15 @@ void QWEBKIT_EXPORT qt_drt_overwritePluginDirectories()
db->refresh();
}
+int QWEBKIT_EXPORT qt_drt_workerThreadCount()
+{
+#if ENABLE(WORKERS)
+ return WebCore::WorkerThread::workerThreadCount();
+#else
+ return 0;
+#endif
+}
+
bool QWebPagePrivate::drtRun = false;
void QWEBKIT_EXPORT qt_drt_run(bool b)
{
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7955e29..0a9223b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,21 @@
+2010-01-27 Diego Gonzalez <diego.gonzalez at 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 at nokia.com>
Reviewed by Laszlo Gombos.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c176387..24129f8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+2010-01-27 Diego Gonzalez <diego.gonzalez at 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 at webkit.org>
Rubberstamped by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 9616464..cd97caa 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -47,6 +47,7 @@ extern void qt_drt_setDomainRelaxationForbiddenForURLScheme(bool forbidden, cons
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)
: QObject()
@@ -432,3 +433,8 @@ void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool forbidd
{
qt_drt_setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
}
+
+int LayoutTestController::workerThreadCount()
+{
+ return qt_drt_workerThreadCount();
+}
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index d55068f..fd2419d 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -52,6 +52,7 @@ namespace WebCore {
class LayoutTestController : public QObject {
Q_OBJECT
Q_PROPERTY(int webHistoryItemCount READ webHistoryItemCount)
+ Q_PROPERTY(int workerThreadCount READ workerThreadCount)
public:
LayoutTestController(WebCore::DumpRenderTree* drt);
@@ -138,6 +139,7 @@ public slots:
void setUserStyleSheetLocation(const QString& url);
void setUserStyleSheetEnabled(bool enabled);
void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
+ int workerThreadCount();
private slots:
void processWork();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list