summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 17:24:55 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 17:24:55 +0000
commit2cb8233eb2b8f8703209cfff81830ac007c2f286 (patch)
tree301afa595c10f4f8bfff7f1ebd5f14b6eeca6144 /chrome
parent3603722dc0afac40a60d91d7340da9f3da4e90d2 (diff)
downloadchromium_src-2cb8233eb2b8f8703209cfff81830ac007c2f286.zip
chromium_src-2cb8233eb2b8f8703209cfff81830ac007c2f286.tar.gz
chromium_src-2cb8233eb2b8f8703209cfff81830ac007c2f286.tar.bz2
Reland the changes to use command line switch to turn on worker feature.
Review URL: http://codereview.chromium.org/48106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/renderer_host/browser_render_process_host.cc1
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h2
-rw-r--r--chrome/renderer/render_thread.cc4
4 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 7aeb243..8155b4e 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -267,6 +267,7 @@ bool BrowserRenderProcessHost::Init() {
switches::kDisablePopupBlocking,
switches::kUseLowFragHeapCrt,
switches::kEnableVideo,
+ switches::kEnableWebWorkers,
};
for (size_t i = 0; i < arraysize(switch_names); ++i) {
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 0a101b4..09755c9d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -403,4 +403,7 @@ const wchar_t kIPCUseFIFO[] = L"ipc-use-fifo";
// Console Debugger when user clicks "Debug JavaScript".
const wchar_t kEnableOutOfProcessDevTools[] = L"enable-oop-devtools";
+// Enable HTML5 Worker support
+const wchar_t kEnableWebWorkers[] = L"enable-web-workers";
+
} // namespace switches
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index cd78d00..ea5909b 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -155,6 +155,8 @@ extern const wchar_t kIPCUseFIFO[];
extern const wchar_t kEnableOutOfProcessDevTools[];
+extern const wchar_t kEnableWebWorkers[];
+
} // namespace switches
#endif // CHROME_COMMON_CHROME_SWITCHES_H__
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 846e866..46d7e0a 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -252,4 +252,8 @@ void RenderThread::EnsureWebKitInitialized() {
command_line.HasSwitch(switches::kRecordMode)) {
WebKit::registerExtension(extensions_v8::PlaybackExtension::Get());
}
+
+ if (command_line.HasSwitch(switches::kEnableWebWorkers)) {
+ WebKit::enableWebWorkers(true);
+ }
}