Diff
Modified: trunk/LayoutTests/ChangeLog (105683 => 105684)
--- trunk/LayoutTests/ChangeLog 2012-01-24 03:59:55 UTC (rev 105683)
+++ trunk/LayoutTests/ChangeLog 2012-01-24 04:07:56 UTC (rev 105684)
@@ -1,3 +1,12 @@
+2012-01-23 Dmitry Lomov <[email protected]>
+
+ [Chromium] Implement layoutTestController.workerThreadCount in DRT
+ https://bugs.webkit.org/show_bug.cgi?id=74653.
+
+ Reviewed by Darin Fisher.
+
+ * platform/chromium/test_expectations.txt:
+
2012-01-23 Emil A Eklund <[email protected]>
Unreviewed test expectations fixes for a couple of window/frame tests.
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (105683 => 105684)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-01-24 03:59:55 UTC (rev 105683)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-01-24 04:07:56 UTC (rev 105684)
@@ -193,16 +193,6 @@
BUGWK74459 SKIP : fast/workers/worker-messageport.html = CRASH
BUGWK74459 SKIP : fast/workers/worker-multi-port.html = CRASH
-BUGWK74449 SKIP : fast/workers/dedicated-worker-lifecycle.html = TIMEOUT
-BUGWK74449 SKIP : fast/workers/worker-close-more.html = TIMEOUT
-BUGWK74449 SKIP : fast/workers/worker-lifecycle.html = TIMEOUT
-
-
-// Tests timing out because layoutTestController.workerThreadCount is not implemented in DRT
-BUGWK74653 SKIP : http/tests/xmlhttprequest/workers/abort-exception-assert.html = TIMEOUT
-BUGWK74653 SKIP : http/tests/workers/terminate-during-sync-operation.html = TIMEOUT
-BUGWK74653 SKIP : fast/workers/storage/interrupt-database.html = TIMEOUT
-
BUGWK71968 : fast/files/workers/worker-apply-blob-url-to-xhr.html = TEXT
BUGCR108798 LINUX : fast/filesystem/workers/file-writer-events.html = CRASH PASS
Modified: trunk/Source/WebKit/chromium/ChangeLog (105683 => 105684)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-24 03:59:55 UTC (rev 105683)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-24 04:07:56 UTC (rev 105684)
@@ -1,3 +1,17 @@
+2012-01-23 Dmitry Lomov <[email protected]>
+
+ [Chromium] Implement layoutTestController.workerThreadCount in DRT
+ https://bugs.webkit.org/show_bug.cgi?id=74653.
+ Expose WebCore::WorkerThread::workerThreadCount() in API layer
+ for DumpRenderTree.
+
+ Reviewed by Darin Fisher.
+
+ * WebKit.gyp:
+ * public/WebWorkerInfo.h: Copied from Source/WebKit/chromium/public/WebCommonWorkerClient.h.
+ * src/WebWorkerInfo.cpp: Copied from Source/WebKit/chromium/public/WebCommonWorkerClient.h.
+ (WebKit::WebWorkerInfo::dedicatedWorkerCount):
+
2012-01-23 Greg Billock <[email protected]>
Fine tune Web Intents Chromium API
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (105683 => 105684)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-01-24 03:59:55 UTC (rev 105683)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-01-24 04:07:56 UTC (rev 105684)
@@ -268,6 +268,8 @@
'public/WebViewClient.h',
'public/WebWidget.h',
'public/WebWidgetClient.h',
+ 'public/WebWorker.h',
+ 'public/WebWorkerInfo.h',
'public/WebWorkerRunLoop.h',
'public/android/WebInputEventFactory.h',
'public/android/WebSandboxSupport.h',
@@ -668,6 +670,7 @@
'src/WebWorkerBase.h',
'src/WebWorkerClientImpl.cpp',
'src/WebWorkerClientImpl.h',
+ 'src/WebWorkerInfo.cpp',
'src/WebWorkerRunLoop.cpp',
'src/WorkerAsyncFileSystemChromium.cpp',
'src/WorkerAsyncFileSystemChromium.h',
Added: trunk/Source/WebKit/chromium/public/WebWorkerInfo.h (0 => 105684)
--- trunk/Source/WebKit/chromium/public/WebWorkerInfo.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebWorkerInfo.h 2012-01-24 04:07:56 UTC (rev 105684)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebWorkerInfo_h
+#define WebWorkerInfo_h
+
+#include "platform/WebCommon.h"
+
+namespace WebKit {
+
+class WebWorkerInfo {
+public:
+ WEBKIT_EXPORT static unsigned dedicatedWorkerCount();
+};
+
+}
+#endif
Added: trunk/Source/WebKit/chromium/src/WebWorkerInfo.cpp (0 => 105684)
--- trunk/Source/WebKit/chromium/src/WebWorkerInfo.cpp (rev 0)
+++ trunk/Source/WebKit/chromium/src/WebWorkerInfo.cpp 2012-01-24 04:07:56 UTC (rev 105684)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebWorkerInfo.h"
+
+#include "WorkerThread.h"
+
+namespace WebKit {
+
+unsigned WebWorkerInfo::dedicatedWorkerCount()
+{
+ return WebCore::WorkerThread::workerThreadCount();
+}
+
+}
Modified: trunk/Tools/ChangeLog (105683 => 105684)
--- trunk/Tools/ChangeLog 2012-01-24 03:59:55 UTC (rev 105683)
+++ trunk/Tools/ChangeLog 2012-01-24 04:07:56 UTC (rev 105684)
@@ -1,3 +1,15 @@
+2012-01-23 Dmitry Lomov <[email protected]>
+
+ [Chromium] Implement layoutTestController.workerThreadCount in DRT
+ https://bugs.webkit.org/show_bug.cgi?id=74653.
+
+ Reviewed by Darin Fisher.
+
+ * DumpRenderTree/chromium/LayoutTestController.cpp:
+ (LayoutTestController::LayoutTestController):
+ (LayoutTestController::workerThreadCount):
+ * DumpRenderTree/chromium/LayoutTestController.h:
+
2012-01-23 Dirk Pranke <[email protected]>
nrwt: make --chromium work like --qt
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp (105683 => 105684)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2012-01-24 03:59:55 UTC (rev 105683)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2012-01-24 04:07:56 UTC (rev 105684)
@@ -36,6 +36,7 @@
#include "TestShell.h"
#include "WebAnimationController.h"
#include "WebBindings.h"
+#include "WebWorkerInfo.h"
#include "WebConsoleMessage.h"
#include "platform/WebData.h"
#include "WebDeviceOrientation.h"
@@ -252,6 +253,7 @@
bindProperty("titleTextDirection", &m_titleTextDirection);
bindProperty("platformName", &m_platformName);
bindProperty("interceptPostMessage", &m_interceptPostMessage);
+ bindProperty("workerThreadCount", &LayoutTestController::workerThreadCount);
}
LayoutTestController::~LayoutTestController()
@@ -2107,6 +2109,11 @@
m_shell->webView()->setFixedLayoutSize(WebSize(width, height));
}
+void LayoutTestController::workerThreadCount(CppVariant* result)
+{
+ result->set(static_cast<int>(WebWorkerInfo::dedicatedWorkerCount()));
+}
+
void LayoutTestController::setPluginsEnabled(const CppArgumentList& arguments, CppVariant* result)
{
if (arguments.size() > 0 && arguments[0].isBool()) {
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h (105683 => 105684)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2012-01-24 03:59:55 UTC (rev 105683)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2012-01-24 04:07:56 UTC (rev 105684)
@@ -430,6 +430,8 @@
void enableFixedLayoutMode(const CppArgumentList&, CppVariant*);
void setFixedLayoutSize(const CppArgumentList&, CppVariant*);
+ void workerThreadCount(CppVariant*);
+
public:
// The following methods are not exposed to _javascript_.
void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); }
