summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 06:27:15 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 06:27:15 +0000
commit99ac91f2d045b836b2d3ab7927077322e7fa9967 (patch)
tree8b7fbfbbfe20e7d9abb0b5628d4a2d9f18aa45b0 /chrome/test
parent68422497a1ac1d9c64a8a3d6e5db3053ce93f25b (diff)
downloadchromium_src-99ac91f2d045b836b2d3ab7927077322e7fa9967.zip
chromium_src-99ac91f2d045b836b2d3ab7927077322e7fa9967.tar.gz
chromium_src-99ac91f2d045b836b2d3ab7927077322e7fa9967.tar.bz2
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
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/worker/test_webworker.cc160
-rw-r--r--chrome/test/worker/test_webworker.h67
-rw-r--r--chrome/test/worker/test_worker.def2
-rw-r--r--chrome/test/worker/test_worker.vcproj174
-rw-r--r--chrome/test/worker/test_worker.vsprops12
-rw-r--r--chrome/test/worker/test_worker_main.cc153
6 files changed, 568 insertions, 0 deletions
diff --git a/chrome/test/worker/test_webworker.cc b/chrome/test/worker/test_webworker.cc
new file mode 100644
index 0000000..b8c839a
--- /dev/null
+++ b/chrome/test/worker/test_webworker.cc
@@ -0,0 +1,160 @@
+// 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"
+
+#if ENABLE(WORKERS)
+
+#include "chrome/test/worker/test_webworker.h"
+
+#include "base/compiler_specific.h"
+#include "base/task.h"
+#undef LOG
+#include "webkit/glue/webworkerclient.h"
+#include "webkit/glue/webworker_impl.h"
+#include "webkit/tools/test_shell/test_webworker_helper.h"
+
+TestWebWorker::TestWebWorker(WebWorkerClient* client,
+ TestWebWorkerHelper* webworker_helper)
+ : webworkerclient_delegate_(client),
+ webworker_impl_(NULL),
+ webworker_helper_(webworker_helper) {
+ AddRef(); // Adds the reference held for worker object.
+ AddRef(); // Adds the reference held for worker context object.
+}
+
+TestWebWorker::~TestWebWorker() {
+ if (webworker_helper_)
+ webworker_helper_->Unload();
+}
+
+void TestWebWorker::StartWorkerContext(const GURL& script_url,
+ const string16& user_agent,
+ const string16& source_code) {
+ webworker_impl_ = new WebWorkerImpl(this);
+
+ webworker_impl_->StartWorkerContext(script_url,
+ user_agent,
+ source_code);
+
+ for (size_t i = 0; i < queued_messages_.size(); ++i)
+ webworker_impl_->PostMessageToWorkerContext(queued_messages_[i]);
+ queued_messages_.clear();
+}
+
+void TestWebWorker::TerminateWorkerContext() {
+ if (webworker_impl_)
+ webworker_impl_->TerminateWorkerContext();
+}
+
+void TestWebWorker::PostMessageToWorkerContext(const string16& message) {
+ if (webworker_impl_)
+ webworker_impl_->PostMessageToWorkerContext(message);
+ else
+ queued_messages_.push_back(message);
+}
+
+void TestWebWorker::WorkerObjectDestroyed() {
+ if (webworker_impl_)
+ webworker_impl_->WorkerObjectDestroyed();
+
+ webworkerclient_delegate_ = NULL;
+ Release(); // Releases the reference held for worker object.
+}
+
+void TestWebWorker::PostMessageToWorkerObject(const string16& message) {
+ if (webworker_helper_->IsMainThread()) {
+ if (webworkerclient_delegate_)
+ webworkerclient_delegate_->PostMessageToWorkerObject(message);
+ } else {
+ webworker_helper_->DispatchToMainThread(
+ InvokeMainThreadMethod, NewRunnableMethod(
+ this, &TestWebWorker::PostMessageToWorkerObject, message));
+ }
+}
+
+void TestWebWorker::PostExceptionToWorkerObject(const string16& error_message,
+ int line_number,
+ const string16& source_url) {
+ if (webworker_helper_->IsMainThread()) {
+ if (webworkerclient_delegate_)
+ webworkerclient_delegate_->PostExceptionToWorkerObject(error_message,
+ line_number,
+ source_url);
+ } else {
+ webworker_helper_->DispatchToMainThread(
+ InvokeMainThreadMethod, NewRunnableMethod(
+ this, &TestWebWorker::PostExceptionToWorkerObject,
+ error_message, line_number, source_url));
+ }
+}
+
+void TestWebWorker::PostConsoleMessageToWorkerObject(
+ int destination,
+ int source,
+ int level,
+ const string16& message,
+ int line_number,
+ const string16& source_url) {
+ if (webworker_helper_->IsMainThread()) {
+ if (webworkerclient_delegate_)
+ webworkerclient_delegate_->PostConsoleMessageToWorkerObject(destination,
+ source,
+ level,
+ message,
+ line_number,
+ source_url);
+ } else {
+ webworker_helper_->DispatchToMainThread(
+ InvokeMainThreadMethod, NewRunnableMethod(
+ this, &TestWebWorker::PostConsoleMessageToWorkerObject,
+ destination, source, level, message, line_number, source_url));
+ }
+}
+
+void TestWebWorker::ConfirmMessageFromWorkerObject(bool has_pending_activity) {
+ if (webworker_helper_->IsMainThread()) {
+ if (webworkerclient_delegate_)
+ webworkerclient_delegate_->ConfirmMessageFromWorkerObject(
+ has_pending_activity);
+ } else {
+ webworker_helper_->DispatchToMainThread(
+ InvokeMainThreadMethod, NewRunnableMethod(
+ this, &TestWebWorker::ConfirmMessageFromWorkerObject,
+ has_pending_activity));
+ }
+}
+
+void TestWebWorker::ReportPendingActivity(bool has_pending_activity) {
+ if (webworker_helper_->IsMainThread()) {
+ if (webworkerclient_delegate_)
+ webworkerclient_delegate_->ReportPendingActivity(has_pending_activity);
+ } else {
+ webworker_helper_->DispatchToMainThread(
+ InvokeMainThreadMethod, NewRunnableMethod(
+ this, &TestWebWorker::ReportPendingActivity,
+ has_pending_activity));
+ }
+}
+
+void TestWebWorker::WorkerContextDestroyed() {
+ if (webworker_helper_->IsMainThread()) {
+ if (webworkerclient_delegate_)
+ webworkerclient_delegate_->WorkerContextDestroyed();
+ Release(); // Releases the reference held for worker context object.
+ } else {
+ webworker_impl_ = NULL;
+ webworker_helper_->DispatchToMainThread(
+ InvokeMainThreadMethod, NewRunnableMethod(
+ this, &TestWebWorker::WorkerContextDestroyed));
+ }
+}
+
+void TestWebWorker::InvokeMainThreadMethod(void* param) {
+ Task* task = static_cast<Task*>(param);
+ task->Run();
+ delete task;
+}
+
+#endif
diff --git a/chrome/test/worker/test_webworker.h b/chrome/test/worker/test_webworker.h
new file mode 100644
index 0000000..aa192e7
--- /dev/null
+++ b/chrome/test/worker/test_webworker.h
@@ -0,0 +1,67 @@
+// 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 CHROME_TEST_WORKER_TEST_WEBWORKER_H_
+#define CHROME_TEST_WORKER_TEST_WEBWORKER_H_
+
+#if ENABLE(WORKERS)
+
+#include <vector>
+
+#include "base/basictypes.h"
+#include "base/ref_counted.h"
+#include "webkit/glue/webworker.h"
+#include "webkit/glue/webworkerclient.h"
+
+class GURL;
+class TestWebWorkerHelper;
+
+class TestWebWorker : public WebWorker,
+ public WebWorkerClient,
+ public base::RefCounted<TestWebWorker> {
+ public:
+ TestWebWorker(WebWorkerClient* client, TestWebWorkerHelper* webworker_helper);
+
+ // WebWorker implementation.
+ virtual void StartWorkerContext(const GURL& script_url,
+ const string16& user_agent,
+ const string16& source_code);
+ virtual void TerminateWorkerContext();
+ virtual void PostMessageToWorkerContext(const string16& message);
+ virtual void WorkerObjectDestroyed();
+
+ // WebWorkerClient implementation.
+ virtual void PostMessageToWorkerObject(const string16& message);
+ virtual void PostExceptionToWorkerObject(
+ const string16& error_message,
+ int line_number,
+ const string16& source_url);
+ virtual void PostConsoleMessageToWorkerObject(
+ int destination,
+ int source,
+ int level,
+ const string16& message,
+ int line_number,
+ const string16& source_url);
+ virtual void ConfirmMessageFromWorkerObject(bool has_pending_activity);
+ virtual void ReportPendingActivity(bool has_pending_activity);
+ virtual void WorkerContextDestroyed();
+
+ private:
+ friend class base::RefCounted<TestWebWorker>;
+ virtual ~TestWebWorker();
+
+ static void InvokeMainThreadMethod(void* param);
+
+ WebWorkerClient* webworkerclient_delegate_;
+ WebWorker* webworker_impl_;
+ TestWebWorkerHelper* webworker_helper_;
+ std::vector<string16> queued_messages_;
+
+ DISALLOW_COPY_AND_ASSIGN(TestWebWorker);
+};
+
+#endif
+
+#endif // CHROME_TEST_WORKER_TEST_WEBWORKER_H_
diff --git a/chrome/test/worker/test_worker.def b/chrome/test/worker/test_worker.def
new file mode 100644
index 0000000..7f6db18
--- /dev/null
+++ b/chrome/test/worker/test_worker.def
@@ -0,0 +1,2 @@
+EXPORTS
+ CreateWebWorker @1
diff --git a/chrome/test/worker/test_worker.vcproj b/chrome/test/worker/test_worker.vcproj
new file mode 100644
index 0000000..c51bbf6
--- /dev/null
+++ b/chrome/test/worker/test_worker.vcproj
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="test_worker"
+ ProjectGUID="{3E03D462-780D-4C4D-B22E-5E095E6CF110}"
+ RootNamespace="test_worker"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\test_worker.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\test_worker.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="winmm.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="..\..\..\webkit\glue\simple_clipboard_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\test_webworker.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\test_webworker.h"
+ >
+ </File>
+ <File
+ RelativePath=".\test_worker.def"
+ >
+ </File>
+ <File
+ RelativePath=".\test_worker_main.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\worker\worker_webkitclient_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\worker\worker_webkitclient_impl.h"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/chrome/test/worker/test_worker.vsprops b/chrome/test/worker/test_worker.vsprops
new file mode 100644
index 0000000..6a5cdcc
--- /dev/null
+++ b/chrome/test/worker/test_worker.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="test_worker"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\..\..\webkit\build\webkit_common.vsprops"
+ >
+ <Tool
+ Name="VCLinkerTool"
+ ModuleDefinitionFile="test_worker.def"
+ />
+</VisualStudioPropertySheet>
diff --git a/chrome/test/worker/test_worker_main.cc b/chrome/test/worker/test_worker_main.cc
new file mode 100644
index 0000000..e3a7f89
--- /dev/null
+++ b/chrome/test/worker/test_worker_main.cc
@@ -0,0 +1,153 @@
+// 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 "base/at_exit.h"
+#include "base/gfx/native_widget_types.h"
+#include "base/logging.h"
+#include "base/path_service.h"
+#include "base/scoped_ptr.h"
+#include "chrome/worker/worker_webkitclient_impl.h"
+#include "chrome/test/worker/test_webworker.h"
+#include "googleurl/src/gurl.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
+#include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/glue/screen_info.h"
+#include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/webworker.h"
+#include "webkit/glue/webworkerclient.h"
+#include "webkit/tools/test_shell/test_webworker_helper.h"
+
+// Create a global AtExitManager so that our code can use code from base that
+// uses Singletons, for example. We don't care about static constructors here.
+static base::AtExitManager global_at_exit_manager;
+
+// WebKit client used in DLL.
+static scoped_ptr<WorkerWebKitClientImpl> webkit_client;
+
+// DLL entry points
+WebWorker* API_CALL CreateWebWorker(WebWorkerClient* webworker_client,
+ TestWebWorkerHelper* webworker_helper) {
+ if (!WebKit::webKitClient()) {
+ webkit_client.reset(new WorkerWebKitClientImpl());
+ WebKit::initialize(webkit_client.get());
+ }
+
+#if ENABLE(WORKERS)
+ return new TestWebWorker(webworker_client, webworker_helper);
+#else
+ return NULL;
+#endif
+}
+
+// WebKit glue functions
+
+namespace webkit_glue {
+
+ResourceLoaderBridge* ResourceLoaderBridge::Create(
+ const std::string& method,
+ const GURL& url,
+ const GURL& policy_url,
+ const GURL& referrer,
+ const std::string& frame_origin,
+ const std::string& main_frame_origin,
+ const std::string& headers,
+ const std::string& default_mime_type,
+ int load_flags,
+ int requestor_pid,
+ ResourceType::Type request_type,
+ int routing_id) {
+ return NULL;
+}
+
+string16 GetLocalizedString(int message_id) {
+ return L"";
+}
+
+std::string GetDataResource(int resource_id) {
+ return "";
+}
+
+void SetMediaPlayerAvailable(bool value) {
+}
+
+bool IsMediaPlayerAvailable() {
+ return false;
+}
+
+void PrecacheUrl(const char16* url, int url_length) {
+}
+
+void AppendToLog(const char* file, int line, const char* msg) {
+ logging::LogMessage(file, line).stream() << msg;
+}
+
+bool GetApplicationDirectory(std::wstring *path) {
+ return PathService::Get(base::DIR_EXE, path);
+}
+
+GURL GetInspectorURL() {
+ return GURL("test-shell-resource://inspector/inspector.html");
+}
+
+std::string GetUIResourceProtocol() {
+ return "test-shell-resource";
+}
+
+bool GetExeDirectory(std::wstring *path) {
+ return PathService::Get(base::DIR_EXE, path);
+}
+
+bool SpellCheckWord(const wchar_t* word, int word_len,
+ int* misspelling_start, int* misspelling_len) {
+ // Report all words being correctly spelled.
+ *misspelling_start = 0;
+ *misspelling_len = 0;
+ return true;
+}
+
+ScreenInfo GetScreenInfo(gfx::NativeViewId window) {
+ return GetScreenInfoHelper(gfx::NativeViewFromId(window));
+}
+
+bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
+ return false;
+}
+
+bool IsPluginRunningInRendererProcess() {
+ return false;
+}
+
+bool GetPluginFinderURL(std::string* plugin_finder_url) {
+ return false;
+}
+
+bool IsDefaultPluginEnabled() {
+ return false;
+}
+
+bool FindProxyForUrl(const GURL& url, std::string* proxy_list) {
+ return false;
+}
+
+std::wstring GetWebKitLocale() {
+ return L"en-US";
+}
+
+#if defined(OS_WIN)
+HCURSOR LoadCursor(int cursor_id) {
+ return NULL;
+}
+
+bool EnsureFontLoaded(HFONT font) {
+ return true;
+}
+
+bool DownloadUrl(const std::string& url, HWND caller_window) {
+ return false;
+}
+#endif
+
+}