summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt19
-rw-r--r--webkit/tools/test_shell/test_shell.gyp2
-rw-r--r--webkit/tools/test_shell/test_shell.vcproj8
-rw-r--r--webkit/tools/test_shell/test_shell_tests.vcproj8
-rw-r--r--webkit/tools/test_shell/test_shell_webkit_init.h5
-rwxr-xr-xwebkit/tools/test_shell/test_webview_delegate.cc11
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h1
-rw-r--r--webkit/tools/test_shell/test_webworker_helper.cc90
-rw-r--r--webkit/tools/test_shell/test_webworker_helper.h53
9 files changed, 190 insertions, 7 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 53f4788..67cb82b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -451,6 +451,19 @@ DEFER : LayoutTests/fast/replaced/table-percent-height.html = FAIL
DEFER : LayoutTests/fast/events/stopPropagation-submit.html = FAIL
// -----------------------------------------------------------------
+// Workers
+// -----------------------------------------------------------------
+
+SKIP LINUX MAC : LayoutTests/fast/workers = TIMEOUT FAIL
+SKIP : LayoutTests/fast/workers/stress-js-execution.html = TIMEOUT FAIL
+SKIP : LayoutTests/fast/workers/worker-timeout.html = TIMEOUT FAIL
+SKIP : LayoutTests/http/tests/workers = TIMEOUT FAIL
+SKIP : LayoutTests/http/tests/xmlhttprequest/workers = TIMEOUT FAIL
+
+// General V8 bug.
+SKIP : LayoutTests/fast/workers/worker-replace-self.html = TIMEOUT FAIL
+
+// -----------------------------------------------------------------
// PENDING TESTS (forked to pending/, need to be sent upstream)
// -----------------------------------------------------------------
@@ -464,10 +477,6 @@ DEFER : LayoutTests/fast/repaint/bugzilla-6473.html = PASS FAIL
// Tests deferred until we provide support for a particular feature.
// -----------------------------------------------------------------
-// Worker related tests (ENABLE_WORKERS):
-DEFER SKIP : LayoutTests/fast/workers = TIMEOUT FAIL
-DEFER SKIP : LayoutTests/http/tests/workers = TIMEOUT FAIL
-DEFER SKIP : LayoutTests/http/tests/xmlhttprequest/workers = TIMEOUT
DEFER: LayoutTests/fast/events/dispatchEvent-crash.html = FAIL
// These tests rely on the keygen tag, which we haven't wired up.
@@ -2312,7 +2321,7 @@ DEFER WIN LINUX : LayoutTests/fast/text/complex-text-opacity.html = FAIL
// Needs rebaseline. See WebKit 41980
DEFER WIN LINUX : LayoutTests/fast/transforms/transforms-with-zoom.html = FAIL
-
+
// Merge WebKit: 41944:41999, Linux failures.
DEFER LINUX : LayoutTests/fast/events/tabindex-focus-blur-all.html = FAIL
DEFER LINUX : LayoutTests/fast/forms/focus2.html = FAIL
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index e6f3a1e..fa40326 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -65,6 +65,8 @@
'test_webview_delegate.h',
'test_webview_delegate_gtk.cc',
'test_webview_delegate_win.cc',
+ 'test_webworker_helper.cc',
+ 'test_webworker_helper.h',
'text_input_controller.cc',
'text_input_controller.h',
'webview_host.h',
diff --git a/webkit/tools/test_shell/test_shell.vcproj b/webkit/tools/test_shell/test_shell.vcproj
index b4d6410..12d36f0 100644
--- a/webkit/tools/test_shell/test_shell.vcproj
+++ b/webkit/tools/test_shell/test_shell.vcproj
@@ -322,6 +322,14 @@
>
</File>
<File
+ RelativePath=".\test_webworker_helper.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\test_webworker_helper.h"
+ >
+ </File>
+ <File
RelativePath=".\text_input_controller.cc"
>
</File>
diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj
index 4311ba6..77ac1ef 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -287,6 +287,14 @@
>
</File>
<File
+ RelativePath=".\test_webworker_helper.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\test_webworker_helper.h"
+ >
+ </File>
+ <File
RelativePath=".\text_input_controller.cc"
>
</File>
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index 6a87100..ac3dcfc 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -33,6 +33,7 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
ASCIIToUTF16(webkit_glue::GetUIResourceProtocol()));
WebKit::registerExtension(extensions_v8::GearsExtension::Get());
WebKit::registerExtension(extensions_v8::IntervalExtension::Get());
+ WebKit::enableWebWorkers();
}
~TestShellWebKitInit() {
@@ -42,10 +43,10 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
virtual WebKit::WebMimeRegistry* mimeRegistry() {
return &mime_registry_;
}
-
+
WebKit::WebClipboard* clipboard() {
if (!clipboard_.get()) {
- // Mock out clipboard calls in layout test mode so that tests don't mess
+ // Mock out clipboard calls in layout test mode so that tests don't mess
// with each other's copies/pastes when running in parallel.
if (TestShell::layout_test_mode()) {
clipboard_.reset(new MockWebClipboardImpl());
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 2a39260..a2cf6c0 100755
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -6,6 +6,8 @@
// as the WebViewDelegate for the TestShellWebHost. The host is expected to
// have initialized a MessageLoop before these methods are called.
+#include "config.h"
+
#include "webkit/tools/test_shell/test_webview_delegate.h"
#include "base/file_util.h"
@@ -29,6 +31,7 @@
#include "webkit/glue/window_open_disposition.h"
#include "webkit/tools/test_shell/test_navigation_controller.h"
#include "webkit/tools/test_shell/test_shell.h"
+#include "webkit/tools/test_shell/test_webworker_helper.h"
#if defined(OS_WIN)
// TODO(port): make these files work everywhere.
@@ -849,3 +852,11 @@ std::wstring TestWebViewDelegate::GetFrameDescription(WebFrame* webframe) {
return L"frame (anonymous)";
}
}
+
+WebWorker* TestWebViewDelegate::CreateWebWorker(WebWorkerClient* client) {
+#if ENABLE(WORKERS)
+ return TestWebWorkerHelper::CreateWebWorker(client);
+#else
+ return NULL;
+#endif
+}
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index c24eccc..1204ded 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -83,6 +83,7 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
const std::string& mime_type,
const std::string& clsid,
std::string* actual_mime_type);
+ virtual WebWorker* CreateWebWorker(WebWorkerClient* client);
virtual void OpenURL(WebView* webview,
const GURL& url,
const GURL& referrer,
diff --git a/webkit/tools/test_shell/test_webworker_helper.cc b/webkit/tools/test_shell/test_webworker_helper.cc
new file mode 100644
index 0000000..c365a2b
--- /dev/null
+++ b/webkit/tools/test_shell/test_webworker_helper.cc
@@ -0,0 +1,90 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "config.h"
+#include <wtf/MainThread.h>
+#include <wtf/Threading.h>
+#undef LOG
+
+#include "build/build_config.h"
+
+#include "webkit/tools/test_shell/test_webworker_helper.h"
+
+#include "base/logging.h"
+#include "base/file_util.h"
+#include "base/path_service.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
+#include "webkit/glue/webworkerclient.h"
+
+
+WebWorker* TestWebWorkerHelper::CreateWebWorker(WebWorkerClient* client) {
+ TestWebWorkerHelper* loader = new TestWebWorkerHelper();
+ return loader->CreateWebWorker_(client, loader);
+}
+
+TestWebWorkerHelper::TestWebWorkerHelper() :
+#if defined(OS_WIN)
+ module_(NULL),
+#endif
+ CreateWebWorker_(NULL) {
+ Load();
+}
+
+TestWebWorkerHelper::~TestWebWorkerHelper() {
+}
+
+bool TestWebWorkerHelper::IsMainThread() const {
+ return WTF::isMainThread();
+}
+
+void TestWebWorkerHelper::DispatchToMainThread(WTF::MainThreadFunction* func,
+ void* context) {
+ return WTF::callOnMainThread(func, context);
+}
+
+bool TestWebWorkerHelper::Load() {
+#if defined(OS_WIN)
+ FilePath path;
+ PathService::Get(base::DIR_EXE, &path);
+ path = path.AppendASCII("test_worker.dll");
+
+ module_ = LoadLibrary(path.value().c_str());
+ if (module_ == 0)
+ return false;
+
+ CreateWebWorker_ = reinterpret_cast<CreateWebWorkerFunc>
+ (GetProcAddress(module_, "CreateWebWorker"));
+ if (!CreateWebWorker_) {
+ FreeLibrary(module_);
+ module_ = 0;
+ return false;
+ }
+
+ return true;
+#else
+ NOTIMPLEMENTED();
+ return false;
+#endif
+}
+
+void TestWebWorkerHelper::Unload() {
+ // Since this is called from DLL, delay the unloading until it can be
+ // invoked from EXE.
+ return WTF::callOnMainThread(UnloadHelper, this);
+}
+
+void TestWebWorkerHelper::UnloadHelper(void* param) {
+ TestWebWorkerHelper* this_ptr = static_cast<TestWebWorkerHelper*>(param);
+
+#if defined(OS_WIN)
+ if (this_ptr->module_) {
+ FreeLibrary(this_ptr->module_);
+ this_ptr->module_ = 0;
+ }
+#else
+ NOTIMPLEMENTED();
+#endif
+
+ delete this_ptr;
+}
diff --git a/webkit/tools/test_shell/test_webworker_helper.h b/webkit/tools/test_shell/test_webworker_helper.h
new file mode 100644
index 0000000..0e6c2b0
--- /dev/null
+++ b/webkit/tools/test_shell/test_webworker_helper.h
@@ -0,0 +1,53 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_WEBWORKER_HELPER_H__
+#define WEBKIT_TOOLS_TEST_SHELL_TEST_WEBWORKER_HELPER_H__
+
+#include <vector>
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
+#include "base/basictypes.h"
+#include "base/port.h"
+
+#include <wtf/MainThread.h>
+
+class TestWebWorkerHelper;
+class WebWorker;
+class WebWorkerClient;
+
+// Function to call in test_worker DLL.
+typedef WebWorker* (API_CALL *CreateWebWorkerFunc)(
+ WebWorkerClient* webworker_client,
+ TestWebWorkerHelper* webworker_helper);;
+
+class TestWebWorkerHelper {
+ public:
+ static WebWorker* CreateWebWorker(WebWorkerClient* client);
+
+ TestWebWorkerHelper();
+ ~TestWebWorkerHelper();
+
+ virtual bool IsMainThread() const;
+ virtual void DispatchToMainThread(WTF::MainThreadFunction* func,
+ void* context);
+ virtual void Unload();
+
+ private:
+ bool Load();
+ static void UnloadHelper(void* param);
+
+#if defined(OS_WIN)
+ // TODO(port): Remove ifdefs when we have portable replacement for HMODULE.
+ HMODULE module_;
+#endif // defined(OS_WIN)
+
+ CreateWebWorkerFunc CreateWebWorker_;
+
+ DISALLOW_COPY_AND_ASSIGN(TestWebWorkerHelper);
+};
+
+#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_WEBWORKER_HELPER_H__
generated by cgit v1.1 at 2025-01-22 01:18:49 +0000