commit f0eff209e47d89bdd6a2f715be55425f79eac833
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Nov 22 05:01:46 2013 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Nov 22 05:01:46 2013 +0000
tree 73007d63017baa901aab87218a8b400245ad2298
parent eca097502355ce6fdc081884f1ccfe8abb527367

Remove ENABLE_WORKERS
https://bugs.webkit.org/show_bug.cgi?id=105784

.:

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-11-21
Reviewed by Darin Adler.

* Source/autotools/SetupWebKitFeatures.m4:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:

Source/WebCore:

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-11-21
Reviewed by Darin Adler.

Source/WebKit:

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-11-21
Reviewed by Darin Adler.

* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:

Source/WebKit/efl:

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-11-21
Reviewed by Darin Adler.

* ewk/ewk_settings.cpp:
(ewk_settings_memory_cache_clear):

Source/WebKit/win:

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-11-21
Reviewed by Darin Adler.

* WebWorkersPrivate.cpp:
(WebWorkersPrivate::workerThreadCount):

Source/WTF:

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-11-21
Reviewed by Darin Adler.

* wtf/FeatureDefines.h:
* wtf/nix/FeatureDefinesNix.h:

Tools:

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-11-21
Reviewed by Darin Adler.

* Scripts/webkitperl/FeatureList.pm:

WebKitLibraries:

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-11-21
Reviewed by Darin Adler.

* win/tools/vsprops/FeatureDefines.props:
* win/tools/vsprops/FeatureDefinesCairo.props:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159679 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/bindings/js/ScheduledAction.cpp

diff --git a/Source/WebCore/bindings/js/ScheduledAction.cpp b/Source/WebCore/bindings/js/ScheduledAction.cpp
index 9242f24e..06c51ca 100644
--- a/Source/WebCore/bindings/js/ScheduledAction.cpp
+++ b/Source/WebCore/bindings/js/ScheduledAction.cpp
@@ -33,17 +33,14 @@
 #include "JSDOMWindow.h"
 #include "JSMainThreadExecState.h"
 #include "JSMainThreadExecStateInstrumentation.h"
+#include "JSWorkerGlobalScope.h"
 #include "ScriptController.h"
 #include "ScriptExecutionContext.h"
 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
-#include <runtime/JSLock.h>
-
-#if ENABLE(WORKERS)
-#include "JSWorkerGlobalScope.h"
 #include "WorkerGlobalScope.h"
 #include "WorkerThread.h"
-#endif
+#include <runtime/JSLock.h>
 
 using namespace JSC;
 
@@ -79,14 +76,10 @@
 {
     if (context->isDocument())
         execute(toDocument(context));
-#if ENABLE(WORKERS)
     else {
         ASSERT_WITH_SECURITY_IMPLICATION(context->isWorkerGlobalScope());
         execute(static_cast<WorkerGlobalScope*>(context));
     }
-#else
-    ASSERT(context->isDocument());
-#endif
 }
 
 void ScheduledAction::executeFunctionInContext(JSGlobalObject* globalObject, JSValue thisValue, ScriptExecutionContext* context)
@@ -135,7 +128,6 @@
         frame->script().executeScriptInWorld(*m_isolatedWorld, m_code);
 }
 
-#if ENABLE(WORKERS)
 void ScheduledAction::execute(WorkerGlobalScope* workerGlobalScope)
 {
     // In a Worker, the execution should always happen on a worker thread.
@@ -151,6 +143,5 @@
         scriptController->evaluate(code);
     }
 }
-#endif // ENABLE(WORKERS)
 
 } // namespace WebCore