summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 16:40:40 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 16:40:40 +0000
commit35869679a0e431a3871718627b0cacc2ab692b5c (patch)
treeb1ea32ce59d2a3c06127e40f4de24e4f96b50c4a /webkit/port
parentd49af7fb105915e2298b9d9c4de11d02022ded3d (diff)
downloadchromium_src-35869679a0e431a3871718627b0cacc2ab692b5c.zip
chromium_src-35869679a0e431a3871718627b0cacc2ab692b5c.tar.gz
chromium_src-35869679a0e431a3871718627b0cacc2ab692b5c.tar.bz2
Revert "Enable building worker and use command line switch to turn on ..."
This reverts commit 11870. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/bindings/v8/V8WorkerCustom.cpp6
-rw-r--r--webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp10
-rw-r--r--webkit/port/bindings/v8/WorkerContextExecutionProxy.h4
3 files changed, 0 insertions, 20 deletions
diff --git a/webkit/port/bindings/v8/V8WorkerCustom.cpp b/webkit/port/bindings/v8/V8WorkerCustom.cpp
index 47be71c..7426383 100644
--- a/webkit/port/bindings/v8/V8WorkerCustom.cpp
+++ b/webkit/port/bindings/v8/V8WorkerCustom.cpp
@@ -34,7 +34,6 @@
#include "v8_binding.h"
#include "v8_custom.h"
#include "v8_proxy.h"
-#include "WorkerContextExecutionProxy.h"
#include "ExceptionCode.h"
#include "Frame.h"
@@ -49,11 +48,6 @@ namespace WebCore {
CALLBACK_FUNC_DECL(WorkerConstructor) {
INC_STATS(L"DOM.Worker.Constructor");
- if (!WorkerContextExecutionProxy::IsWebWorkersEnabled()) {
- V8Proxy::ThrowError(V8Proxy::SYNTAX_ERROR, "Worker is not enabled.");
- return v8::Undefined();
- }
-
if (!args.IsConstructCall()) {
V8Proxy::ThrowError(V8Proxy::TYPE_ERROR,
"DOM object constructor cannot be called as a function.");
diff --git a/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
index bfc4dec..b9ccf66 100644
--- a/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
+++ b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
@@ -45,16 +45,6 @@
namespace WebCore {
-static bool g_worker_enabled = false;
-
-bool WorkerContextExecutionProxy::IsWebWorkersEnabled() {
- return g_worker_enabled;
-}
-
-void WorkerContextExecutionProxy::EnableWebWorkers(bool value) {
- g_worker_enabled = true;
-}
-
WorkerContextExecutionProxy::WorkerContextExecutionProxy(
WorkerContext* workerContext)
: m_workerContext(workerContext),
diff --git a/webkit/port/bindings/v8/WorkerContextExecutionProxy.h b/webkit/port/bindings/v8/WorkerContextExecutionProxy.h
index 9a5a0aa..2aaa160 100644
--- a/webkit/port/bindings/v8/WorkerContextExecutionProxy.h
+++ b/webkit/port/bindings/v8/WorkerContextExecutionProxy.h
@@ -88,10 +88,6 @@ class WorkerContextExecutionProxy {
static v8::Handle<v8::Value> EventTargetToV8Object(EventTarget* target);
static v8::Handle<v8::Value> WorkerContextToV8Object(WorkerContext* wc);
- // Enables HTML5 worker support.
- static void EnableWebWorkers(bool value);
- static bool IsWebWorkersEnabled();
-
private:
void InitContextIfNeeded();
void Dispose();