Enable worker layout tests. In order for test_shell to run worker, we link all of the code required to run the worker into a DLL and then load that DLL in test_shell. This allows us to host a separate V8 instance.

Review URL: http://codereview.chromium.org/50045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12763 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 196 insertions, 7 deletions

diff --git a/webkit/glue/webworkerclient_impl.cc b/webkit/glue/webworkerclient_impl.cc
index 11ccfca..68cd330 100644
--- a/webkit/glue/webworkerclient_impl.cc
+++ b/webkit/glue/webworkerclient_impl.cc
@@ -67,13 +67,17 @@ WebWorkerClientImpl::~WebWorkerClientImpl() {
 }
 
 void WebWorkerClientImpl::set_webworker(WebWorker* webworker) {
-  webworker_.reset(webworker);
+  webworker_ = webworker;
 }
 
 void WebWorkerClientImpl::startWorkerContext(
     const WebCore::KURL& scriptURL,
     const WebCore::String& userAgent,
     const WebCore::String& sourceCode) {
+  // Worker.terminate() could be called from JS before the context is started.
+  if (asked_to_terminate_)
+      return;
+
   webworker_->StartWorkerContext(webkit_glue::KURLToGURL(scriptURL),
                                  webkit_glue::StringToString16(userAgent),
                                  webkit_glue::StringToString16(sourceCode));
@@ -89,6 +93,10 @@ void WebWorkerClientImpl::terminateWorkerContext() {
 
 void WebWorkerClientImpl::postMessageToWorkerContext(
     const WebCore::String& message) {
+  // Worker.terminate() could be called from JS before the context is started.
+  if (asked_to_terminate_)
+      return;
+
   ++unconfirmed_message_count_;
   webworker_->PostMessageToWorkerContext(
       webkit_glue::StringToString16(message));
diff --git a/webkit/glue/webworkerclient_impl.h b/webkit/glue/webworkerclient_impl.h
index 4c8277c..5a8a4cd 100644
--- a/webkit/glue/webworkerclient_impl.h
+++ b/webkit/glue/webworkerclient_impl.h
@@ -7,7 +7,6 @@
 
 #if ENABLE(WORKERS)
 
-#include "base/scoped_ptr.h"
 #include "webkit/glue/webworkerclient.h"
 
 #include "WorkerContextProxy.h"
@@ -61,7 +60,7 @@ class WebWorkerClientImpl : public WebCore::WorkerContextProxy,
   WTF::RefPtr<WebCore::ScriptExecutionContext> script_execution_context_;
 
   WebCore::Worker* worker_;
-  scoped_ptr<WebWorker> webworker_;
+  WebWorker* webworker_;
   bool asked_to_terminate_;
   uint32 unconfirmed_message_count_;
   bool worker_context_had_pending_activity_;
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c08139d..3c55e34 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -451,6 +451,18 @@ DEFER : LayoutTests/fast/replaced/table-percent-height.html = FAIL
 DEFER : LayoutTests/fast/events/stopPropagation-submit.html = FAIL
 
 // -----------------------------------------------------------------
+// Workers
+// -----------------------------------------------------------------
+
+DEFER LINUX MAC : LayoutTests/fast/workers = TIMEOUT FAIL
+DEFER SKIP : LayoutTests/fast/workers/stress-js-execution.html = TIMEOUT
+DEFER SKIP : LayoutTests/fast/workers/worker-timeout.html = TIMEOUT
+DEFER SKIP : LayoutTests/http/tests/xmlhttprequest/workers = TIMEOUT
+
+// General V8 bug.
+DEFER SKIP : LayoutTests/fast/workers/worker-replace-self.html = FAIL
+
+// -----------------------------------------------------------------
 // PENDING TESTS (forked to pending/, need to be sent upstream)
 // -----------------------------------------------------------------
 
@@ -464,10 +476,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.
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 5c3094f..d45f520 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -63,6 +63,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 8ced6eb..7301863 100644
--- a/webkit/tools/test_shell/test_shell.vcproj
+++ b/webkit/tools/test_shell/test_shell.vcproj
@@ -314,6 +314,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 ac9db53..145b4a9 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -279,6 +279,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 b0ae2d2..b16a9a2 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -31,6 +31,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() {
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 2a39260..c8dc039 100755
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -8,6 +8,8 @@
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
+#include "config.h"
+
 #include "base/file_util.h"
 #include "base/gfx/point.h"
 #include "base/gfx/native_widget_types.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__