Remove ENABLE_WORKERS
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Nov 2013 05:01:46 +0000 (05:01 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Nov 2013 05:01:46 +0000 (05:01 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@159679 268f45cc-cd09-0410-ab3c-d52691b4dbfc

116 files changed:
ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/FeatureDefines.h
Source/WTF/wtf/nix/FeatureDefinesNix.h
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Modules/indexeddb/IDBFactory.cpp
Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp
Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h
Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp
Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h
Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl
Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp
Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h
Source/WebCore/UseJSC.cmake
Source/WebCore/WebCore.exp.in
Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp
Source/WebCore/bindings/generic/ActiveDOMCallback.cpp
Source/WebCore/bindings/js/DOMRequestState.h
Source/WebCore/bindings/js/JSDOMGlobalObject.cpp
Source/WebCore/bindings/js/JSDOMWindowCustom.cpp
Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
Source/WebCore/bindings/js/JSEventListener.cpp
Source/WebCore/bindings/js/JSWorkerCustom.cpp
Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp
Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h
Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp
Source/WebCore/bindings/js/ScheduledAction.cpp
Source/WebCore/bindings/js/ScheduledAction.h
Source/WebCore/bindings/js/ScriptProfiler.cpp
Source/WebCore/bindings/js/ScriptProfiler.h
Source/WebCore/bindings/js/ScriptState.cpp
Source/WebCore/bindings/js/ScriptState.h
Source/WebCore/bindings/js/WorkerScriptController.cpp
Source/WebCore/bindings/js/WorkerScriptController.h
Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp
Source/WebCore/bindings/js/WorkerScriptDebugServer.h
Source/WebCore/dom/EventTargetFactory.in
Source/WebCore/dom/MessagePort.cpp
Source/WebCore/dom/ScriptExecutionContext.cpp
Source/WebCore/inspector/CodeGeneratorInspector.py
Source/WebCore/inspector/InspectorConsoleInstrumentation.h
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InspectorProfilerAgent.cpp
Source/WebCore/inspector/InspectorProfilerAgent.h
Source/WebCore/inspector/InspectorWorkerAgent.cpp
Source/WebCore/inspector/InspectorWorkerAgent.h
Source/WebCore/inspector/InspectorWorkerResource.h
Source/WebCore/inspector/InstrumentingAgents.cpp
Source/WebCore/inspector/InstrumentingAgents.h
Source/WebCore/inspector/WorkerConsoleAgent.cpp
Source/WebCore/inspector/WorkerConsoleAgent.h
Source/WebCore/inspector/WorkerDebuggerAgent.cpp
Source/WebCore/inspector/WorkerDebuggerAgent.h
Source/WebCore/inspector/WorkerInspectorController.cpp
Source/WebCore/inspector/WorkerInspectorController.h
Source/WebCore/inspector/WorkerRuntimeAgent.cpp
Source/WebCore/inspector/WorkerRuntimeAgent.h
Source/WebCore/loader/ThreadableLoader.cpp
Source/WebCore/loader/WorkerThreadableLoader.cpp
Source/WebCore/loader/WorkerThreadableLoader.h
Source/WebCore/loader/cache/MemoryCache.cpp
Source/WebCore/page/WorkerNavigator.cpp
Source/WebCore/page/WorkerNavigator.h
Source/WebCore/page/WorkerNavigator.idl
Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm
Source/WebCore/testing/Internals.cpp
Source/WebCore/workers/AbstractWorker.cpp
Source/WebCore/workers/AbstractWorker.h
Source/WebCore/workers/AbstractWorker.idl
Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp
Source/WebCore/workers/DedicatedWorkerGlobalScope.h
Source/WebCore/workers/DedicatedWorkerGlobalScope.idl
Source/WebCore/workers/DedicatedWorkerThread.cpp
Source/WebCore/workers/DedicatedWorkerThread.h
Source/WebCore/workers/Worker.cpp
Source/WebCore/workers/Worker.h
Source/WebCore/workers/Worker.idl
Source/WebCore/workers/WorkerGlobalScope.cpp
Source/WebCore/workers/WorkerGlobalScope.h
Source/WebCore/workers/WorkerGlobalScope.idl
Source/WebCore/workers/WorkerGlobalScopeProxy.h
Source/WebCore/workers/WorkerLoaderProxy.h
Source/WebCore/workers/WorkerLocation.cpp
Source/WebCore/workers/WorkerLocation.h
Source/WebCore/workers/WorkerLocation.idl
Source/WebCore/workers/WorkerMessagingProxy.cpp
Source/WebCore/workers/WorkerMessagingProxy.h
Source/WebCore/workers/WorkerObjectProxy.h
Source/WebCore/workers/WorkerReportingProxy.h
Source/WebCore/workers/WorkerRunLoop.cpp
Source/WebCore/workers/WorkerRunLoop.h
Source/WebCore/workers/WorkerScriptLoader.cpp
Source/WebCore/workers/WorkerScriptLoader.h
Source/WebCore/workers/WorkerScriptLoaderClient.h
Source/WebCore/workers/WorkerThread.cpp
Source/WebCore/workers/WorkerThread.h
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/ewk/ewk_settings.cpp
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebWorkersPrivate.cpp
Source/autotools/SetupWebKitFeatures.m4
Source/cmake/WebKitFeatures.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/webkitperl/FeatureList.pm
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.props
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props

index da531e3..7dd7cbf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-11-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove ENABLE_WORKERS
+        https://bugs.webkit.org/show_bug.cgi?id=105784
+
+        Reviewed by Darin Adler.
+
+        * Source/autotools/SetupWebKitFeatures.m4:
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmakeconfig.h.cmake:
+
 2013-11-20  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r159496.
index 3b03ced..c145c4b 100644 (file)
@@ -1,3 +1,13 @@
+2013-11-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove ENABLE_WORKERS
+        https://bugs.webkit.org/show_bug.cgi?id=105784
+
+        Reviewed by Darin Adler.
+
+        * wtf/FeatureDefines.h:
+        * wtf/nix/FeatureDefinesNix.h:
+
 2013-11-21  Mark Rowe  <mrowe@apple.com>
 
         <https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
index 750254f..45f5b98 100644 (file)
 #define ENABLE_WEB_TIMING 0
 #endif
 
-#if !defined(ENABLE_WORKERS)
-#define ENABLE_WORKERS 0
-#endif
-
 #if !defined(ENABLE_XHR_TIMEOUT)
 #define ENABLE_XHR_TIMEOUT 0
 #endif
index 745d8d0..f16e154 100644 (file)
 #define ENABLE_WEB_TIMING 1
 #endif
 
-#if !defined(ENABLE_WORKERS)
-#define ENABLE_WORKERS 1
-#endif
-
 #if !defined(ENABLE_XHR_RESPONSE_BLOB)
 #define ENABLE_XHR_RESPONSE_BLOB 1
 #endif
index 4219255..94ebbb3 100644 (file)
@@ -2605,7 +2605,7 @@ set(WebCore_LIBRARIES
     WTF
 )
 
-if (ENABLE_SQL_DATABASE AND ENABLE_WORKERS)
+if (ENABLE_SQL_DATABASE)
     list(APPEND WebCore_SOURCES
         Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp
     )
index 7f2a44b..5936fa4 100644 (file)
@@ -1,3 +1,10 @@
+2013-11-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove ENABLE_WORKERS
+        https://bugs.webkit.org/show_bug.cgi?id=105784
+
+        Reviewed by Darin Adler.
+
 2013-11-21  Alex Christensen  <achristensen@webkit.org>
 
         [Win] Unreviewed build fix after r159632.
index e7dfead..9f406fa 100644 (file)
@@ -74,10 +74,6 @@ static bool isContextValid(ScriptExecutionContext* context)
         Document* document = toDocument(context);
         return document->frame() && document->page();
     }
-#if !ENABLE(WORKERS)
-    if (context->isWorkerGlobalScope())
-        return false;
-#endif
     return true;
 }
 
@@ -88,12 +84,10 @@ static String getIndexedDBDatabasePath(ScriptExecutionContext* context)
         Document* document = toDocument(context);
         return document->page()->group().groupSettings().indexedDBDatabasePath();
     }
-#if ENABLE(WORKERS)
     WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context);
     const GroupSettings* groupSettings = workerGlobalScope->groupSettings();
     if (groupSettings)
         return groupSettings->indexedDBDatabasePath();
-#endif
     return String();
 }
 }
index 27eb5e1..2074b15 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE)
+#if ENABLE(INDEXED_DATABASE)
 
 #include "WorkerGlobalScopeIndexedDatabase.h"
 
@@ -84,4 +84,4 @@ IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB()
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE)
+#endif // ENABLE(INDEXED_DATABASE)
index 3f689ee..c00b0ab 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef WorkerGlobalScopeIndexedDatabase_h
 #define WorkerGlobalScopeIndexedDatabase_h
 
-#if ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE)
+#if ENABLE(INDEXED_DATABASE)
 
 #include "Supplementable.h"
 #include <wtf/text/WTFString.h>
@@ -58,6 +58,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE)
+#endif // ENABLE(INDEXED_DATABASE)
 
 #endif // WorkerGlobalScopeIndexedDatabase_h
index a035c08..d30ae81 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "config.h"
 
-#if ENABLE(SQL_DATABASE) && ENABLE(WORKERS)
+#if ENABLE(SQL_DATABASE)
 
 #include "WorkerGlobalScopeWebDatabase.h"
 
@@ -73,4 +73,4 @@ PassRefPtr<DatabaseSync> WorkerGlobalScopeWebDatabase::openDatabaseSync(WorkerGl
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE) && ENABLE(WORKERS)
+#endif // ENABLE(SQL_DATABASE)
index 70166bf..fcccab1 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef WorkerGlobalScopeWebDatabase_h
 #define WorkerGlobalScopeWebDatabase_h
 
-#if ENABLE(SQL_DATABASE) && ENABLE(WORKERS)
+#if ENABLE(SQL_DATABASE)
 
 #include "ExceptionCode.h"
 #include <wtf/Forward.h>
@@ -54,6 +54,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE) && ENABLE(WORKERS)
+#endif // ENABLE(SQL_DATABASE)
 
 #endif // WorkerGlobalScopeWebDatabase_h
index c3140b9..d22d087 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 [
-    Conditional=SQL_DATABASE&WORKERS,
+    Conditional=SQL_DATABASE,
 ] partial interface WorkerGlobalScope {
     [RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
 
index de821d2..919c605 100644 (file)
@@ -55,7 +55,6 @@ PassRefPtr<ThreadableWebSocketChannel> ThreadableWebSocketChannel::create(Script
     ASSERT(context);
     ASSERT(client);
 
-#if ENABLE(WORKERS)
     if (context->isWorkerGlobalScope()) {
         WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context);
         WorkerRunLoop& runLoop = workerGlobalScope->thread()->runLoop();
@@ -63,7 +62,6 @@ PassRefPtr<ThreadableWebSocketChannel> ThreadableWebSocketChannel::create(Script
         mode.append(String::number(runLoop.createUniqueId()));
         return WorkerThreadableWebSocketChannel::create(workerGlobalScope, client, mode);
     }
-#endif // ENABLE(WORKERS)
 
     return WebSocketChannel::create(toDocument(context), client);
 }
index 6ed3ca2..15b6d3c 100644 (file)
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS)
+#if ENABLE(WEB_SOCKETS)
 #include "ThreadableWebSocketChannelClientWrapper.h"
 
 #include "CrossThreadCopier.h"
index d364c65..29f5495 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef ThreadableWebSocketChannelClientWrapper_h
 #define ThreadableWebSocketChannelClientWrapper_h
 
-#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS)
+#if ENABLE(WEB_SOCKETS)
 
 #include "ScriptExecutionContext.h"
 #include "ThreadableWebSocketChannel.h"
index eb6ac57..8873c16 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS)
+#if ENABLE(WEB_SOCKETS)
 
 #include "WorkerThreadableWebSocketChannel.h"
 
index fd93fdd..ca526db 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef WorkerThreadableWebSocketChannel_h
 #define WorkerThreadableWebSocketChannel_h
 
-#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS)
+#if ENABLE(WEB_SOCKETS)
 
 #include "ThreadableWebSocketChannel.h"
 #include "WebSocketChannelClient.h"
index 09b4add..a971fa0 100644 (file)
@@ -184,7 +184,6 @@ if (ENABLE_INDEXED_DATABASE)
     )
 endif ()
 
-if (ENABLE_WORKERS)
     list(APPEND WebCore_SOURCES
         bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
         bindings/js/JSWorkerGlobalScopeBase.cpp
@@ -193,7 +192,6 @@ if (ENABLE_WORKERS)
         bindings/js/WorkerScriptController.cpp
         bindings/js/WorkerScriptDebugServer.cpp
     )
-endif ()
 
 if (ENABLE_VIDEO_TRACK)
     list(APPEND WebCore_SOURCES
index 9738692..70d733d 100644 (file)
@@ -241,6 +241,7 @@ __ZN7WebCore12TextIterator8subrangeEPNS_5RangeEii
 __ZN7WebCore12TextIteratorC1EPKNS_5RangeENS_20TextIteratorBehaviorE
 __ZN7WebCore12TextIteratorD1Ev
 __ZN7WebCore12UTF8EncodingEv
+__ZN7WebCore12WorkerThread17workerThreadCountEv
 __ZN7WebCore12cacheStorageEv
 __ZN7WebCore12deleteCookieERKNS_21NetworkStorageSessionERKNS_3URLERKN3WTF6StringE
 __ZN7WebCore12gcControllerEv
@@ -2881,10 +2882,6 @@ __ZNK7WebCore16HTMLMediaElement6pausedEv
 __ZN7WebCore4Page11setViewModeENS0_8ViewModeE
 #endif
 
-#if ENABLE(WORKERS)
-__ZN7WebCore12WorkerThread17workerThreadCountEv
-#endif
-
 #if ENABLE(VIDEO_TRACK)
 __ZN7WebCore9PageGroup18captionPreferencesEv
 #endif
index 1ef1076..2194efe 100644 (file)
 #include "ThreadCheck.h"
 #include "WebDOMDOMApplicationCache.h"
 #include "WebDOMDOMWindow.h"
+#include "WebDOMDedicatedWorkerGlobalScope.h"
 #include "WebDOMEventSource.h"
 #include "WebDOMMessagePort.h"
 #include "WebDOMNode.h"
+#include "WebDOMWorker.h"
 #include "WebDOMXMLHttpRequest.h"
 #include "WebDOMXMLHttpRequestUpload.h"
 #include "WebExceptionHandler.h"
 
 #include <wtf/RefPtr.h>
 
-#if ENABLE(WORKERS)
-#include "WebDOMDedicatedWorkerGlobalScope.h"
-#include "WebDOMWorker.h"
-#endif
-
 #if ENABLE(SHARED_WORKERS)
 #include "WebDOMSharedWorker.h"
 #include "WebDOMSharedWorkerGlobalScope.h"
@@ -112,11 +109,6 @@ WebDOM##type WebDOMEventTarget::to##type() \
 ConvertTo(Node)
 ConvertTo(DOMWindow)
 
-#if ENABLE(WORKERS) && 0
-ConvertTo(Worker)
-ConvertTo(DedicatedWorkerGlobalScope)
-#endif
-
 #if ENABLE(SHARED_WORKERS)
 ConvertTo(SharedWorker)
 ConvertTo(SharedWorkerGlobalScope)
@@ -150,14 +142,6 @@ WebDOMEventTarget toWebKit(WebCore::EventTarget* value)
         return toWebKit(instance);
 #endif
 
-#if ENABLE(WORKERS) && 0
-    if (WebCore::Worker* worker = value->toWorker())
-        return toWebKit(worker);
-
-    if (WebCore::DedicatedWorkerGlobalScope* workerGlobalScope = value->toDedicatedWorkerGlobalScope())
-        return toWebKit(workerGlobalScope);
-#endif
-
 #if ENABLE(SHARED_WORKERS)
     if (WebCore::SharedWorker* sharedWorker = value->toSharedWorker())
         return toWebKit(sharedWorker);
index 0e326f7..81a10c1 100644 (file)
 
 #include "ActiveDOMObject.h"
 #include "ScriptExecutionContext.h"
-
-#if ENABLE(WORKERS)
 #include "WorkerGlobalScope.h"
-#endif
 
 namespace WebCore {
 
index 05b6b09..3453f5b 100644 (file)
@@ -31,9 +31,7 @@
 #include "DOMWrapperWorld.h"
 #include "Document.h"
 #include "ScriptState.h"
-#if ENABLE(WORKERS)
 #include "WorkerGlobalScope.h"
-#endif
 
 #include <JavaScriptCore/APIShims.h>
 
@@ -51,10 +49,8 @@ public:
             Document* document = toDocument(m_scriptExecutionContext);
             m_exec = execStateFromPage(mainThreadNormalWorld(), document->page());
         } else {
-#if ENABLE(WORKERS)
             WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(m_scriptExecutionContext);
             m_exec = execStateFromWorkerGlobalScope(workerGlobalScope);
-#endif
         }
     }
 
index fcbd143..2cc95b1 100644 (file)
 #include "Document.h"
 #include "JSDOMWindow.h"
 #include "JSEventListener.h"
-
-#if ENABLE(WORKERS)
 #include "JSWorkerGlobalScope.h"
 #include "WorkerGlobalScope.h"
-#endif
 
 using namespace JSC;
 
@@ -71,10 +68,8 @@ ScriptExecutionContext* JSDOMGlobalObject::scriptExecutionContext() const
 {
     if (inherits(JSDOMWindowBase::info()))
         return jsCast<const JSDOMWindowBase*>(this)->scriptExecutionContext();
-#if ENABLE(WORKERS)
     if (inherits(JSWorkerGlobalScopeBase::info()))
         return jsCast<const JSWorkerGlobalScopeBase*>(this)->scriptExecutionContext();
-#endif
     ASSERT_NOT_REACHED();
     return 0;
 }
@@ -116,10 +111,8 @@ JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext* scriptExecutionCo
     if (scriptExecutionContext->isDocument())
         return toJSDOMGlobalObject(toDocument(scriptExecutionContext), exec);
 
-#if ENABLE(WORKERS)
     if (scriptExecutionContext->isWorkerGlobalScope())
         return static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->workerGlobalScopeWrapper();
-#endif
 
     ASSERT_NOT_REACHED();
     return 0;
@@ -135,10 +128,8 @@ JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext* scriptExecutionCo
     if (scriptExecutionContext->isDocument())
         return toJSDOMGlobalObject(toDocument(scriptExecutionContext), world);
 
-#if ENABLE(WORKERS)
     if (scriptExecutionContext->isWorkerGlobalScope())
         return static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->workerGlobalScopeWrapper();
-#endif
 
     ASSERT_NOT_REACHED();
     return 0;
index b65d4c9..35abfd3 100644 (file)
 #include "JSHTMLOptionElement.h"
 #include "JSImageConstructor.h"
 #include "JSMessagePortCustom.h"
+#include "JSWorker.h"
 #include "Location.h"
 #include "ScheduledAction.h"
 #include "Settings.h"
 #include "SharedWorkerRepository.h"
 
-#if ENABLE(WORKERS)
-#include "JSWorker.h"
-#endif
-
 #if ENABLE(SHARED_WORKERS)
 #include "JSSharedWorker.h"
 #endif
index 45c6aa7..ea62e28 100644 (file)
@@ -30,9 +30,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(WORKERS)
-
 #include "JSDedicatedWorkerGlobalScope.h"
 
 #include "JSDOMBinding.h"
@@ -48,5 +45,3 @@ JSC::JSValue JSDedicatedWorkerGlobalScope::postMessage(JSC::ExecState* exec)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 703c2ab..00d16c8 100644 (file)
@@ -137,13 +137,11 @@ void JSEventListener::handleEvent(ScriptExecutionContext* scriptExecutionContext
 
         globalObject->setCurrentEvent(savedEvent);
 
-#if ENABLE(WORKERS)
         if (scriptExecutionContext->isWorkerGlobalScope()) {
             bool terminatorCausedException = (exec->hadException() && isTerminatedExecutionException(exec->exception()));
             if (terminatorCausedException || vm.watchdog.didFire())
                 static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->forbidExecution();
         }
-#endif
 
         if (exec->hadException()) {
             event->target()->uncaughtExceptionInEventHandler();
index a40a05e..caa5318 100644 (file)
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "JSWorker.h"
 
 #include "Document.h"
@@ -72,5 +70,3 @@ EncodedJSValue JSC_HOST_CALL JSWorkerConstructor::constructJSWorker(ExecState* e
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index ff5fdbe..c360402 100644 (file)
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "JSWorkerGlobalScopeBase.h"
 
 #include "DOMWrapperWorld.h"
@@ -157,5 +155,3 @@ JSWorkerGlobalScope* toJSWorkerGlobalScope(JSValue value)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 7bc9809..56804a4 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef JSWorkerGlobalScopeBase_h
 #define JSWorkerGlobalScopeBase_h
 
-#if ENABLE(WORKERS)
-
 #include "JSDOMGlobalObject.h"
 
 namespace WebCore {
@@ -85,6 +83,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // JSWorkerGlobalScopeBase_h
index d6836e1..d12d98e 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "JSWorkerGlobalScope.h"
 
 #include "ExceptionCode.h"
@@ -118,5 +116,3 @@ JSValue JSWorkerGlobalScope::setInterval(ExecState* exec)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 9242f24..06c51ca 100644 (file)
 #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 @@ void ScheduledAction::execute(ScriptExecutionContext* context)
 {
     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 @@ void ScheduledAction::execute(Document* document)
         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 @@ void ScheduledAction::execute(WorkerGlobalScope* workerGlobalScope)
         scriptController->evaluate(code);
     }
 }
-#endif // ENABLE(WORKERS)
 
 } // namespace WebCore
index e93a83a..19add3f 100644 (file)
@@ -61,9 +61,7 @@ namespace WebCore {
 
         void executeFunctionInContext(JSC::JSGlobalObject*, JSC::JSValue thisValue, ScriptExecutionContext*);
         void execute(Document*);
-#if ENABLE(WORKERS)
         void execute(WorkerGlobalScope*);
-#endif
 
         JSC::Strong<JSC::Unknown> m_function;
         Vector<JSC::Strong<JSC::Unknown>> m_args;
index 2f9780c..fde27d0 100644 (file)
@@ -68,12 +68,10 @@ void ScriptProfiler::startForPage(Page* inspectedPage, const String& title)
     start(scriptState, title);
 }
 
-#if ENABLE(WORKERS)
 void ScriptProfiler::startForWorkerGlobalScope(WorkerGlobalScope* context, const String& title)
 {
     start(execStateFromWorkerGlobalScope(context), title);
 }
-#endif
 
 PassRefPtr<ScriptProfile> ScriptProfiler::stop(JSC::ExecState* state, const String& title)
 {
@@ -87,12 +85,10 @@ PassRefPtr<ScriptProfile> ScriptProfiler::stopForPage(Page* inspectedPage, const
     return stop(scriptState, title);
 }
 
-#if ENABLE(WORKERS)
 PassRefPtr<ScriptProfile> ScriptProfiler::stopForWorkerGlobalScope(WorkerGlobalScope* context, const String& title)
 {
     return stop(execStateFromWorkerGlobalScope(context), title);
 }
-#endif
 
 } // namespace WebCore
 
index 7df2b34..727c6ee 100644 (file)
@@ -61,14 +61,10 @@ public:
     static unsigned getHeapObjectId(const ScriptValue&);
     static void start(JSC::ExecState*, const String& title);
     static void startForPage(Page*, const String& title);
-#if ENABLE(WORKERS)
     static void startForWorkerGlobalScope(WorkerGlobalScope*, const String& title);
-#endif
     static PassRefPtr<ScriptProfile> stop(JSC::ExecState*, const String& title);
     static PassRefPtr<ScriptProfile> stopForPage(Page*, const String& title);
-#if ENABLE(WORKERS)
     static PassRefPtr<ScriptProfile> stopForWorkerGlobalScope(WorkerGlobalScope*, const String& title);
-#endif
     static PassRefPtr<ScriptHeapSnapshot> takeHeapSnapshot(const String&, HeapSnapshotProgress*) { return 0; }
     static bool causesRecompilation() { return true; }
     static bool isSampling() { return false; }
index f369b73..af1048d 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "Document.h"
 #include "JSDOMWindowBase.h"
+#include "JSWorkerGlobalScope.h"
 #include "MainFrame.h"
 #include "Node.h"
 #include "Page.h"
@@ -43,9 +44,6 @@
 #include <interpreter/CallFrame.h>
 #include <runtime/JSGlobalObject.h>
 
-#if ENABLE(WORKERS)
-#include "JSWorkerGlobalScope.h"
-#endif
 
 namespace WebCore {
 
@@ -90,11 +88,9 @@ JSC::ExecState* execStateFromPage(DOMWrapperWorld& world, Page* page)
     return page->mainFrame().script().globalObject(world)->globalExec();
 }
 
-#if ENABLE(WORKERS)
 JSC::ExecState* execStateFromWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
 {
     return workerGlobalScope->script()->workerGlobalScopeWrapper()->globalExec();
 }
-#endif
 
 }
index 4f41fda..349d94a 100644 (file)
@@ -59,10 +59,7 @@ JSC::ExecState* mainWorldExecState(Frame*);
 
 JSC::ExecState* execStateFromNode(DOMWrapperWorld&, Node*);
 JSC::ExecState* execStateFromPage(DOMWrapperWorld&, Page*);
-
-#if ENABLE(WORKERS)
 JSC::ExecState* execStateFromWorkerGlobalScope(WorkerGlobalScope*);
-#endif
 
 } // namespace WebCore
 
index 200912a..290b1f1 100644 (file)
@@ -26,9 +26,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(WORKERS)
-
 #include "WorkerScriptController.h"
 
 #include "JSDOMBinding.h"
@@ -207,5 +204,3 @@ void WorkerScriptController::detachDebugger(JSC::Debugger* debugger)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 34305b6..8bb7f49 100644 (file)
@@ -28,7 +28,6 @@
 #ifndef WorkerScriptController_h
 #define WorkerScriptController_h
 
-#if ENABLE(WORKERS)
 #include <debugger/Debugger.h>
 #include <heap/Strong.h>
 #include <wtf/Forward.h>
@@ -99,6 +98,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerScriptController_h
index b417f43..68a4853 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "config.h"
 
-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(WORKERS)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
 #include "WorkerScriptDebugServer.h"
 
 #include "WorkerDebuggerAgent.h"
@@ -98,4 +98,4 @@ void WorkerScriptDebugServer::interruptAndRunTask(PassOwnPtr<ScriptDebugServer::
 
 } // namespace WebCore
 
-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(WORKERS)
+#endif // ENABLE(JAVASCRIPT_DEBUGGER)
index f47aa46..b057861 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef WorkerScriptDebugServer_h
 #define WorkerScriptDebugServer_h
 
-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(WORKERS)
+#if ENABLE(JAVASCRIPT_DEBUGGER)
 
 #include "ScriptDebugServer.h"
 
@@ -68,6 +68,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(WORKERS)
+#endif // ENABLE(JAVASCRIPT_DEBUGGER)
 
 #endif // WorkerScriptDebugServer_h
index 8a91afd..a75085a 100644 (file)
@@ -4,7 +4,7 @@ AudioNode conditional=WEB_AUDIO
 AudioContext conditional=WEB_AUDIO
 AudioTrackList conditional=VIDEO_TRACK
 BatteryManager conditional=BATTERY_STATUS
-DedicatedWorkerGlobalScope conditional=WORKERS
+DedicatedWorkerGlobalScope
 DOMApplicationCache
 DOMWindow
 EventSource
@@ -40,7 +40,7 @@ TextTrackList conditional=VIDEO_TRACK
 VideoTrackList conditional=VIDEO_TRACK
 WebKitNamedFlow
 WebSocket conditional=WEB_SOCKETS
-Worker conditional=WORKERS
+Worker
 XMLHttpRequest
 XMLHttpRequestUpload
 
index b060497..3da853c 100644 (file)
@@ -156,11 +156,9 @@ void MessagePort::dispatchMessages()
     OwnPtr<MessagePortChannelArray> channels;
     while (m_entangledChannel && m_entangledChannel->tryGetMessageFromRemote(message, channels)) {
 
-#if ENABLE(WORKERS)
         // close() in Worker onmessage handler should prevent next message from dispatching.
         if (m_scriptExecutionContext->isWorkerGlobalScope() && static_cast<WorkerGlobalScope*>(m_scriptExecutionContext)->isClosing())
             return;
-#endif
 
         OwnPtr<MessagePortArray> ports = MessagePort::entanglePorts(*m_scriptExecutionContext, channels.release());
         RefPtr<Event> evt = MessageEvent::create(ports.release(), message.release());
index c9020fe..b5eba5d 100644 (file)
@@ -143,10 +143,8 @@ void ScriptExecutionContext::dispatchMessagePortEvents()
 void ScriptExecutionContext::createdMessagePort(MessagePort* port)
 {
     ASSERT(port);
-#if ENABLE(WORKERS)
     ASSERT((isDocument() && isMainThread())
         || (isWorkerGlobalScope() && currentThread() == static_cast<WorkerGlobalScope*>(this)->thread()->threadID()));
-#endif
 
     m_messagePorts.add(port);
 }
@@ -154,10 +152,8 @@ void ScriptExecutionContext::createdMessagePort(MessagePort* port)
 void ScriptExecutionContext::destroyedMessagePort(MessagePort* port)
 {
     ASSERT(port);
-#if ENABLE(WORKERS)
     ASSERT((isDocument() && isMainThread())
         || (isWorkerGlobalScope() && currentThread() == static_cast<WorkerGlobalScope*>(this)->thread()->threadID()));
-#endif
 
     m_messagePorts.remove(port);
 }
@@ -397,10 +393,8 @@ JSC::VM* ScriptExecutionContext::vm()
      if (isDocument())
         return JSDOMWindow::commonVM();
 
-#if ENABLE(WORKERS)
     if (isWorkerGlobalScope())
         return static_cast<WorkerGlobalScope*>(this)->script()->vm();
-#endif
 
     ASSERT_NOT_REACHED();
     return 0;
index d475b3c..f890f4f 100755 (executable)
@@ -48,7 +48,6 @@ DOMAIN_DEFINE_NAME_MAP = {
     "DOMDebugger": "JAVASCRIPT_DEBUGGER",
     "IndexedDB": "INDEXED_DATABASE",
     "Profiler": "JAVASCRIPT_DEBUGGER",
-    "Worker": "WORKERS",
 }
 
 
index 08f9883..ff20757 100644 (file)
@@ -91,7 +91,6 @@ inline void InspectorInstrumentation::addMessageToConsole(Page* page, MessageSou
 #endif
 }
 
-#if ENABLE(WORKERS)
 inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope* workerGlobalScope, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
 {
 #if ENABLE(INSPECTOR)
@@ -126,7 +125,6 @@ inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope* wor
     UNUSED_PARAM(requestIdentifier);
 #endif
 }
-#endif
 
 inline void InspectorInstrumentation::consoleCount(Page* page, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
 {
index 71b69fb..d7516a5 100644 (file)
@@ -151,9 +151,7 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
 
 #endif
 
-#if ENABLE(WORKERS)
     m_agents.append(InspectorWorkerAgent::create(m_instrumentingAgents.get()));
-#endif
 
     m_agents.append(InspectorCanvasAgent::create(m_instrumentingAgents.get(), pageAgent, m_injectedScriptManager.get()));
 
index 529ce36..c4c51cb 100644 (file)
@@ -1116,7 +1116,6 @@ void InspectorInstrumentation::didDispatchDOMStorageEventImpl(InstrumentingAgent
         domStorageAgent->didDispatchDOMStorageEvent(key, oldValue, newValue, storageType, securityOrigin, page);
 }
 
-#if ENABLE(WORKERS)
 bool InspectorInstrumentation::shouldPauseDedicatedWorkerOnStartImpl(InstrumentingAgents* instrumentingAgents)
 {
     if (InspectorWorkerAgent* workerAgent = instrumentingAgents->inspectorWorkerAgent())
@@ -1148,7 +1147,6 @@ void InspectorInstrumentation::workerGlobalScopeTerminatedImpl(InstrumentingAgen
     if (InspectorWorkerAgent* workerAgent = instrumentingAgents->inspectorWorkerAgent())
         workerAgent->workerGlobalScopeTerminated(proxy);
 }
-#endif
 
 #if ENABLE(WEB_SOCKETS)
 void InspectorInstrumentation::didCreateWebSocketImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, const URL& requestURL, const URL&, const String& protocol, Document* document)
@@ -1331,7 +1329,6 @@ InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForRenderer(Re
     return instrumentingAgentsForFrame(&renderer->frame());
 }
 
-#if ENABLE(WORKERS)
 InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
 {
     if (!workerGlobalScope)
@@ -1345,7 +1342,6 @@ InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForNonDocument
         return instrumentationForWorkerGlobalScope(static_cast<WorkerGlobalScope*>(context));
     return 0;
 }
-#endif
 
 #if ENABLE(GEOLOCATION)
 GeolocationPosition* InspectorInstrumentation::overrideGeolocationPositionImpl(InstrumentingAgents* instrumentingAgents, GeolocationPosition* position)
index 07dbf44..bd5c952 100644 (file)
@@ -233,11 +233,11 @@ public:
     static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
     static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<ScriptArguments>, unsigned long requestIdentifier = 0);
     static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
-#if ENABLE(WORKERS)
+
     // FIXME: Convert to ScriptArguments to match non-worker context.
     static void addMessageToConsole(WorkerGlobalScope*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
     static void addMessageToConsole(WorkerGlobalScope*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
-#endif
+
     static void consoleCount(Page*, JSC::ExecState*, PassRefPtr<ScriptArguments>);
     static void startConsoleTiming(Frame*, const String& title);
     static void stopConsoleTiming(Frame*, const String& title, PassRefPtr<ScriptCallStack>);
@@ -261,12 +261,10 @@ public:
 
     static void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
 
-#if ENABLE(WORKERS)
     static bool shouldPauseDedicatedWorkerOnStart(ScriptExecutionContext*);
     static void didStartWorkerGlobalScope(ScriptExecutionContext*, WorkerGlobalScopeProxy*, const URL&);
     static void workerGlobalScopeTerminated(ScriptExecutionContext*, WorkerGlobalScopeProxy*);
     static void willEvaluateWorkerScript(WorkerGlobalScope*, int workerThreadStartMode);
-#endif
 
 #if ENABLE(WEB_SOCKETS)
     static void didCreateWebSocket(Document*, unsigned long identifier, const URL& requestURL, const URL& documentURL, const String& protocol);
@@ -464,11 +462,9 @@ private:
 
     static void didDispatchDOMStorageEventImpl(InstrumentingAgents*, const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
 
-#if ENABLE(WORKERS)
     static bool shouldPauseDedicatedWorkerOnStartImpl(InstrumentingAgents*);
     static void didStartWorkerGlobalScopeImpl(InstrumentingAgents*, WorkerGlobalScopeProxy*, const URL&);
     static void workerGlobalScopeTerminatedImpl(InstrumentingAgents*, WorkerGlobalScopeProxy*);
-#endif
 
 #if ENABLE(WEB_SOCKETS)
     static void didCreateWebSocketImpl(InstrumentingAgents*, unsigned long identifier, const URL& requestURL, const URL& documentURL, const String& protocol, Document*);
@@ -489,10 +485,8 @@ private:
     static InstrumentingAgents* instrumentingAgentsForDocument(Document*);
     static InstrumentingAgents* instrumentingAgentsForRenderer(RenderObject*);
 
-#if ENABLE(WORKERS)
     static InstrumentingAgents* instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope*);
     static InstrumentingAgents* instrumentingAgentsForNonDocumentContext(ScriptExecutionContext*);
-#endif
 
     static bool collectingHTMLParseErrors(InstrumentingAgents*);
     static void pauseOnNativeEventIfNeeded(InstrumentingAgents*, bool isDOMEvent, const String& eventName, bool synchronous);
@@ -1831,7 +1825,6 @@ inline void InspectorInstrumentation::didDispatchDOMStorageEvent(const String& k
 #endif // ENABLE(INSPECTOR)
 }
 
-#if ENABLE(WORKERS)
 inline bool InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(ScriptExecutionContext* context)
 {
 #if ENABLE(INSPECTOR)
@@ -1867,9 +1860,6 @@ inline void InspectorInstrumentation::workerGlobalScopeTerminated(ScriptExecutio
 #endif
 }
 
-#endif
-
-
 #if ENABLE(WEB_SOCKETS)
 inline void InspectorInstrumentation::didCreateWebSocket(Document* document, unsigned long identifier, const URL& requestURL, const URL& documentURL, const String& protocol)
 {
@@ -2096,11 +2086,7 @@ inline InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForCont
         return 0;
     if (context->isDocument())
         return instrumentingAgentsForPage(toDocument(context)->page());
-#if ENABLE(WORKERS)
     return instrumentingAgentsForNonDocumentContext(context);
-#else
-    return 0;
-#endif
 }
 
 inline InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForFrame(Frame* frame)
index 529cae6..baf51f4 100644 (file)
@@ -91,7 +91,6 @@ PassOwnPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InstrumentingA
     return adoptPtr(new PageProfilerAgent(instrumentingAgents, consoleAgent, inspectedPage, injectedScriptManager));
 }
 
-#if ENABLE(WORKERS)
 class WorkerProfilerAgent : public InspectorProfilerAgent {
 public:
     WorkerProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, WorkerGlobalScope* workerGlobalScope, InjectedScriptManager* injectedScriptManager)
@@ -118,7 +117,6 @@ PassOwnPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InstrumentingA
 {
     return adoptPtr(new WorkerProfilerAgent(instrumentingAgents, consoleAgent, workerGlobalScope, injectedScriptManager));
 }
-#endif
 
 InspectorProfilerAgent::InspectorProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, InjectedScriptManager* injectedScriptManager)
     : InspectorBaseAgent(ASCIILiteral("Profiler"), instrumentingAgents)
index e0550b6..53709c5 100644 (file)
@@ -58,9 +58,8 @@ class InspectorProfilerAgent : public InspectorBaseAgent, public InspectorProfil
     WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<InspectorProfilerAgent> create(InstrumentingAgents*, InspectorConsoleAgent*, Page*, InjectedScriptManager*);
-#if ENABLE(WORKERS)
     static PassOwnPtr<InspectorProfilerAgent> create(InstrumentingAgents*, InspectorConsoleAgent*, WorkerGlobalScope*, InjectedScriptManager*);
-#endif
+
     virtual ~InspectorProfilerAgent();
 
     void addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, unsigned columnNumber, const String& sourceURL);
index f648549..68cadab 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS) && ENABLE(INSPECTOR)
+#if ENABLE(INSPECTOR)
 
 #include "InspectorWorkerAgent.h"
 
@@ -154,11 +154,7 @@ void InspectorWorkerAgent::disable(ErrorString*)
 
 void InspectorWorkerAgent::canInspectWorkers(ErrorString*, bool* result)
 {
-#if ENABLE(WORKERS)
     *result = true;
-#else
-    *result = false;
-#endif
 }
 
 void InspectorWorkerAgent::connectToWorker(ErrorString* error, int workerId)
@@ -246,4 +242,4 @@ void InspectorWorkerAgent::createWorkerFrontendChannel(WorkerGlobalScopeProxy* w
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS) && ENABLE(INSPECTOR)
+#endif // ENABLE(INSPECTOR)
index 78559de..ab6221a 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef InspectorWorkerAgent_h
 #define InspectorWorkerAgent_h
 
-#if ENABLE(WORKERS)
-
 #include "InspectorBaseAgent.h"
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
@@ -89,5 +87,3 @@ private:
 } // namespace WebCore
 
 #endif // !defined(InspectorWorkerAgent_h)
-
-#endif // ENABLE(WORKERS)
index 2b8041f..bf116b3 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef InspectorWorkerResource_h
 #define InspectorWorkerResource_h
 
-#if ENABLE(WORKERS) && ENABLE(INSPECTOR)
+#if ENABLE(INSPECTOR)
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -65,6 +65,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS) && ENABLE(INSPECTOR)
+#endif // ENABLE(INSPECTOR)
 
 #endif // InspectorWorkerResource_h
index ac064df..8cfb328 100644 (file)
@@ -66,9 +66,7 @@ InstrumentingAgents::InstrumentingAgents()
     , m_inspectorDOMDebuggerAgent(0)
     , m_inspectorProfilerAgent(0)
 #endif
-#if ENABLE(WORKERS)
     , m_inspectorWorkerAgent(0)
-#endif
     , m_inspectorCanvasAgent(0)
 {
 }
@@ -98,9 +96,7 @@ void InstrumentingAgents::reset()
     m_inspectorDOMDebuggerAgent = 0;
     m_inspectorProfilerAgent = 0;
 #endif
-#if ENABLE(WORKERS)
     m_inspectorWorkerAgent = 0;
-#endif
     m_inspectorCanvasAgent = 0;
 }
 
@@ -112,14 +108,12 @@ InstrumentingAgents* instrumentationForPage(Page* page)
     return 0;
 }
 
-#if ENABLE(WORKERS)
 InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
 {
     if (WorkerInspectorController* controller = workerGlobalScope->workerInspectorController())
         return controller->m_instrumentingAgents.get();
     return 0;
 }
-#endif
 
 } // namespace WebCore
 
index c249472..86c9143 100644 (file)
@@ -127,10 +127,8 @@ public:
     void setInspectorHeapProfilerAgent(InspectorHeapProfilerAgent* agent) { m_inspectorHeapProfilerAgent = agent; }
 #endif
 
-#if ENABLE(WORKERS)
     InspectorWorkerAgent* inspectorWorkerAgent() const { return m_inspectorWorkerAgent; }
     void setInspectorWorkerAgent(InspectorWorkerAgent* agent) { m_inspectorWorkerAgent = agent; }
-#endif
 
     InspectorCanvasAgent* inspectorCanvasAgent() const { return m_inspectorCanvasAgent; }
     void setInspectorCanvasAgent(InspectorCanvasAgent* agent) { m_inspectorCanvasAgent = agent; }
@@ -167,16 +165,12 @@ private:
     InspectorProfilerAgent* m_inspectorProfilerAgent;
     InspectorHeapProfilerAgent* m_inspectorHeapProfilerAgent;
 #endif
-#if ENABLE(WORKERS)
     InspectorWorkerAgent* m_inspectorWorkerAgent;
-#endif
     InspectorCanvasAgent* m_inspectorCanvasAgent;
 };
 
 InstrumentingAgents* instrumentationForPage(Page*);
-#if ENABLE(WORKERS)
 InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope*);
-#endif
 
 }
 
index c1dd548..15bb7a8 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#if ENABLE(INSPECTOR)
 
 #include "WorkerConsoleAgent.h"
 
@@ -57,4 +57,4 @@ bool WorkerConsoleAgent::developerExtrasEnabled()
 
 } // namespace WebCore
 
-#endif // ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#endif // ENABLE(INSPECTOR)
index 16a8a3e..1e9c10c 100644 (file)
@@ -34,7 +34,7 @@
 #include "InspectorConsoleAgent.h"
 #include <wtf/PassOwnPtr.h>
 
-#if ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#if ENABLE(INSPECTOR)
 
 namespace WebCore {
 
@@ -57,6 +57,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#endif // ENABLE(INSPECTOR)
 
 #endif // !defined(WorkerConsoleAgent_h)
index 5779198..7136e46 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
 #include "WorkerDebuggerAgent.h"
 
 #include "ScriptDebugServer.h"
@@ -146,4 +146,4 @@ void WorkerDebuggerAgent::unmuteConsole()
 
 } // namespace WebCore
 
-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
index c7df0f3..e5eb6f0 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef WorkerDebuggerAgent_h
 #define WorkerDebuggerAgent_h
 
-#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
 #include "InspectorDebuggerAgent.h"
 #include "WorkerScriptDebugServer.h"
 
@@ -66,6 +66,6 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
 
 #endif // !defined(WorkerDebuggerAgent_h)
index 4f5deae..c294fe4 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#if ENABLE(INSPECTOR)
 
 #include "WorkerInspectorController.h"
 
index 160f4ec..f5175e7 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef WorkerInspectorController_h
 #define WorkerInspectorController_h
 
-#if ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#if ENABLE(INSPECTOR)
 
 #include "InspectorAgentRegistry.h"
 #include "InspectorBaseAgent.h"
@@ -80,6 +80,6 @@ private:
 
 }
 
-#endif // ENABLE(WORKERS)
+#endif // ENABLE(INSPECTOR)
 
 #endif // !defined(WorkerInspectorController_h)
index 0ab9033..b07b633 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#if ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#if ENABLE(INSPECTOR)
 
 #include "WorkerRuntimeAgent.h"
 
@@ -106,4 +106,4 @@ void WorkerRuntimeAgent::pauseWorkerGlobalScope(WorkerGlobalScope* context)
 
 } // namespace WebCore
 
-#endif // ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#endif // ENABLE(INSPECTOR)
index 3172275..67de08a 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef WorkerRuntimeAgent_h
 #define WorkerRuntimeAgent_h
 
-#if ENABLE(INSPECTOR) && ENABLE(WORKERS)
+#if ENABLE(INSPECTOR)
 
 #include "InspectorRuntimeAgent.h"
 #include <wtf/PassOwnPtr.h>
index d00a06e..8a3a985 100644 (file)
@@ -56,10 +56,8 @@ PassRefPtr<ThreadableLoader> ThreadableLoader::create(ScriptExecutionContext* co
     ASSERT(client);
     ASSERT(context);
 
-#if ENABLE(WORKERS)
     if (context->isWorkerGlobalScope())
         return WorkerThreadableLoader::create(static_cast<WorkerGlobalScope*>(context), client, WorkerRunLoop::defaultMode(), request, options);
-#endif // ENABLE(WORKERS)
 
     return DocumentThreadableLoader::create(toDocument(context), client, request, options);
 }
@@ -68,12 +66,10 @@ void ThreadableLoader::loadResourceSynchronously(ScriptExecutionContext* context
 {
     ASSERT(context);
 
-#if ENABLE(WORKERS)
     if (context->isWorkerGlobalScope()) {
         WorkerThreadableLoader::loadResourceSynchronously(static_cast<WorkerGlobalScope*>(context), request, client, options);
         return;
     }
-#endif // ENABLE(WORKERS)
 
     DocumentThreadableLoader::loadResourceSynchronously(toDocument(context), request, client, options);
 }
index 416cb06..d10ef7e 100644 (file)
@@ -29,9 +29,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(WORKERS)
-
 #include "WorkerThreadableLoader.h"
 
 #include "Document.h"
@@ -246,5 +243,3 @@ void WorkerThreadableLoader::MainThreadBridge::didFailRedirectCheck()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index c7bc9cd..cc723b4 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef WorkerThreadableLoader_h
 #define WorkerThreadableLoader_h
 
-#if ENABLE(WORKERS)
-
 #include "ThreadableLoader.h"
 #include "ThreadableLoaderClient.h"
 #include "ThreadableLoaderClientWrapper.h"
@@ -143,6 +141,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerThreadableLoader_h
index 8506f01..28665cc 100644 (file)
@@ -751,13 +751,11 @@ void MemoryCache::removeUrlFromCache(ScriptExecutionContext* context, const Stri
 
 void MemoryCache::removeRequestFromCache(ScriptExecutionContext* context, const ResourceRequest& request)
 {
-#if ENABLE(WORKERS)
     if (context->isWorkerGlobalScope()) {
         WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context);
         workerGlobalScope->thread()->workerLoaderProxy().postTaskToLoader(createCallbackTask(&crossThreadRemoveRequestFromCache, request));
         return;
     }
-#endif
 
     removeRequestFromCacheImpl(context, request);
 }
index 339f107..eac5ddf 100644 (file)
@@ -25,9 +25,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(WORKERS)
-
 #include "WorkerNavigator.h"
 
 namespace WebCore {
@@ -47,5 +44,3 @@ String WorkerNavigator::userAgent() const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 9659079..f25d8cd 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WorkerNavigator_h
 #define WorkerNavigator_h
 
-#if ENABLE(WORKERS)
-
 #include "NavigatorBase.h"
 #include "Supplementable.h"
 #include <wtf/PassRefPtr.h>
@@ -52,6 +50,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerNavigator_h
index 265442c..e2a282d 100644 (file)
@@ -28,7 +28,6 @@
 
 [
     NoInterfaceObject,
-    Conditional=WORKERS,
     GenerateIsReachable=Impl,
     JSNoStaticTables,
 ] interface WorkerNavigator {
index e6e96db..23fb4fe 100644 (file)
@@ -165,9 +165,7 @@ void MemoryPressureHandler::releaseMemory(bool)
 
     // FastMalloc has lock-free thread specific caches that can only be cleared from the thread itself.
     StorageThread::releaseFastMallocFreeMemoryInAllThreads();
-#if ENABLE(WORKERS)
     WorkerThread::releaseFastMallocFreeMemoryInAllThreads();
-#endif
 #if ENABLE(THREADED_SCROLLING)
     ScrollingThread::dispatch(bind(WTF::releaseFastMallocFreeMemory));
 #endif
index 855fe51..ca9969d 100644 (file)
@@ -330,11 +330,7 @@ InternalSettings* Internals::settings() const
 
 unsigned Internals::workerThreadCount() const
 {
-#if ENABLE(WORKERS)
     return WorkerThread::workerThreadCount();
-#else
-    return 0;
-#endif
 }
 
 String Internals::address(Node* node)
index 8dfce4c..85b9b54 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "AbstractWorker.h"
 
 #include "ContentSecurityPolicy.h"
@@ -83,5 +81,3 @@ URL AbstractWorker::resolveURL(const String& url, ExceptionCode& ec)
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index e9d67d9..0f13e80 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef AbstractWorker_h
 #define AbstractWorker_h
 
-#if ENABLE(WORKERS)
-
 #include "ActiveDOMObject.h"
 #include "EventListener.h"
 #include "EventNames.h"
@@ -72,6 +70,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // AbstractWorker_h
index 8aa6e66..b2aee68 100644 (file)
@@ -31,7 +31,6 @@
 
 [
     NoInterfaceObject,
-    Conditional=WORKERS,
 ] interface AbstractWorker {
     attribute EventListener onerror;
 };
index 12728c5..701569f 100644 (file)
@@ -31,7 +31,6 @@
 #include "config.h"
 #include "DedicatedWorkerGlobalScope.h"
 
-#if ENABLE(WORKERS)
 #include "DOMWindow.h"
 #include "DedicatedWorkerThread.h"
 #include "MessageEvent.h"
@@ -90,5 +89,3 @@ DedicatedWorkerThread* DedicatedWorkerGlobalScope::thread()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index dae7c1d..d94629b 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef DedicatedWorkerGlobalScope_h
 #define DedicatedWorkerGlobalScope_h
 
-#if ENABLE(WORKERS)
-
 #include "ContentSecurityPolicy.h"
 #include "MessagePort.h"
 #include "WorkerGlobalScope.h"
@@ -69,6 +67,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // DedicatedWorkerGlobalScope_h
index 4b9c6ae..ce824f6 100644 (file)
@@ -30,7 +30,6 @@
 
 [
     GlobalContext=DedicatedWorkerGlobalScope,
-    Conditional=WORKERS,
     JSGenerateToNativeObject,
     JSNoStaticTables,
 ] interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
index fc8275a..1020ce9 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "DedicatedWorkerThread.h"
 
 #include "DedicatedWorkerGlobalScope.h"
@@ -68,5 +66,3 @@ void DedicatedWorkerThread::runEventLoop()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 9a914d4..512c70b 100644 (file)
@@ -30,8 +30,6 @@
 #ifndef DedicatedWorkerThread_h
 #define DedicatedWorkerThread_h
 
-#if ENABLE(WORKERS)
-
 #include "ContentSecurityPolicy.h"
 #include "WorkerThread.h"
 
@@ -56,6 +54,4 @@ namespace WebCore {
     };
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // DedicatedWorkerThread_h
index 401249a..5f095ae 100644 (file)
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "Worker.h"
 
 #include "DOMWindow.h"
@@ -178,5 +176,3 @@ void Worker::notifyFinished()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index b6d263a..ee5246c 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef Worker_h
 #define Worker_h
 
-#if ENABLE(WORKERS)
-
 #include "AbstractWorker.h"
 #include "ActiveDOMObject.h"
 #include "EventListener.h"
@@ -85,6 +83,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // Worker_h
index e569584..3be8044 100644 (file)
@@ -26,7 +26,6 @@
  */
 
 [
-    Conditional=WORKERS,
     CustomConstructor(DOMString scriptUrl),
     JSGenerateToNativeObject,
     JSGenerateToJSObject,
index 2937974..ec2d190 100644 (file)
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "WorkerGlobalScope.h"
 
 #include "ActiveDOMObject.h"
@@ -356,5 +354,3 @@ WorkerEventQueue& WorkerGlobalScope::eventQueue() const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 2532b92..59417b6 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef WorkerGlobalScope_h
 #define WorkerGlobalScope_h
 
-#if ENABLE(WORKERS)
-
 #include "ContentSecurityPolicy.h"
 #include "EventListener.h"
 #include "EventNames.h"
@@ -183,6 +181,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerGlobalScope_h
index 5aa362f..1dc9054 100644 (file)
@@ -26,7 +26,6 @@
 
 [
     GlobalContext=WorkerGlobalScope,
-    Conditional=WORKERS,
     JSCustomMarkFunction,
     JSCustomGetOwnPropertySlotAndDescriptor,
     EventTarget,
index a95dc75..0a30071 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef WorkerGlobalScopeProxy_h
 #define WorkerGlobalScopeProxy_h
 
-#if ENABLE(WORKERS)
-
 #include "MessagePort.h"
 #include "WorkerThread.h"
 #include <wtf/Forward.h>
@@ -76,6 +74,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerGlobalScopeProxy_h
index 18542b6..6293124 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef WorkerLoaderProxy_h
 #define WorkerLoaderProxy_h
 
-#if ENABLE(WORKERS)
-
 #include "ScriptExecutionContext.h"
 #include <wtf/Forward.h>
 #include <wtf/PassOwnPtr.h>
@@ -59,6 +57,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerLoaderProxy_h
index 2acdc86..3a637c2 100644 (file)
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "WorkerLocation.h"
 
 #include <wtf/text/WTFString.h>
@@ -76,5 +74,3 @@ String WorkerLocation::hash() const
 
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 1111b5d..d3d3b28 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef WorkerLocation_h
 #define WorkerLocation_h
 
-#if ENABLE(WORKERS)
-
 #include "URL.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -67,6 +65,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerLocation_h
index 1509673..ff54aa7 100644 (file)
@@ -28,7 +28,6 @@
 
 [
     GlobalContext=WorkerGlobalScope,
-    Conditional=WORKERS,
     GenerateIsReachable=Impl,
     JSNoStaticTables,
     ImplementationLacksVTable,
index 200c08e..0196f02 100644 (file)
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "WorkerMessagingProxy.h"
 
 #include "ContentSecurityPolicy.h"
@@ -535,5 +533,3 @@ bool WorkerMessagingProxy::hasPendingActivity() const
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index b6b49f2..0d7a6cd 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef WorkerMessagingProxy_h
 #define WorkerMessagingProxy_h
 
-#if ENABLE(WORKERS)
-
 #include "ScriptExecutionContext.h"
 #include "WorkerGlobalScopeProxy.h"
 #include "WorkerLoaderProxy.h"
@@ -122,6 +120,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerMessagingProxy_h
index ffb492d..7ae3fbb 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef WorkerObjectProxy_h
 #define WorkerObjectProxy_h
 
-#if ENABLE(WORKERS)
-
 #include "WorkerReportingProxy.h"
 #include "MessagePort.h"
 #include <wtf/PassOwnPtr.h>
@@ -55,6 +53,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerObjectProxy_h
index 389e521..61a6611 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef WorkerReportingProxy_h
 #define WorkerReportingProxy_h
 
-#if ENABLE(WORKERS)
-
 #include "ConsoleTypes.h"
 #include <wtf/Forward.h>
 
@@ -58,6 +56,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerReportingProxy_h
index f4a2efc..9a9f556 100644 (file)
@@ -30,8 +30,6 @@
  
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "ScriptExecutionContext.h"
 #include "SharedTimer.h"
 #include "ThreadGlobalData.h"
@@ -230,5 +228,3 @@ WorkerRunLoop::Task::Task(PassOwnPtr<ScriptExecutionContext::Task> task, const S
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 3dee5a5..10aa81b 100644 (file)
@@ -31,8 +31,6 @@
 #ifndef WorkerRunLoop_h
 #define WorkerRunLoop_h
 
-#if ENABLE(WORKERS)
-
 #include "ScriptExecutionContext.h"
 #include <wtf/MessageQueue.h>
 #include <wtf/OwnPtr.h>
@@ -99,6 +97,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerRunLoop_h
index 8da4eef..116dadf 100644 (file)
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "WorkerScriptLoader.h"
 
 #include "CrossThreadTask.h"
@@ -189,5 +187,3 @@ void WorkerScriptLoader::notifyFinished()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index 9cb4fbd..cc704a6 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef WorkerScriptLoader_h
 #define WorkerScriptLoader_h
 
-#if ENABLE(WORKERS)
-
 #include "URL.h"
 #include "ResourceRequest.h"
 #include "ThreadableLoader.h"
@@ -103,6 +101,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerScriptLoader_h
index 371f9b7..4112cf2 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef WorkerScriptLoaderClient_h
 #define WorkerScriptLoaderClient_h
 
-#if ENABLE(WORKERS)
-
 namespace WebCore {
 
     class ResourceResponse;
@@ -48,6 +46,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerScriptLoaderClient_h
index 6733d14..50bfa1d 100644 (file)
@@ -26,8 +26,6 @@
 
 #include "config.h"
 
-#if ENABLE(WORKERS)
-
 #include "WorkerThread.h"
 
 #include "DedicatedWorkerGlobalScope.h"
@@ -281,5 +279,3 @@ void WorkerThread::releaseFastMallocFreeMemoryInAllThreads()
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(WORKERS)
index b1fa22e..96d9b07 100644 (file)
@@ -27,8 +27,6 @@
 #ifndef WorkerThread_h
 #define WorkerThread_h
 
-#if ENABLE(WORKERS)
-
 #include "ContentSecurityPolicy.h"
 #include "GroupSettings.h"
 #include "WorkerRunLoop.h"
@@ -103,7 +101,5 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(WORKERS)
-
 #endif // WorkerThread_h
 
index 33d58a9..ab993d5 100644 (file)
@@ -1,3 +1,12 @@
+2013-11-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove ENABLE_WORKERS
+        https://bugs.webkit.org/show_bug.cgi?id=105784
+
+        Reviewed by Darin Adler.
+
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+
 2013-11-21  peavo@outlook.com  <peavo@outlook.com>
 
         [WinCairo] Building ANGLE libraries fails.
index 187001a..b5fd004 100644 (file)
@@ -116,6 +116,7 @@ EXPORTS
         symbolWithPointer(??1HitTestResult@WebCore@@QAE@XZ, ??1HitTestResult@WebCore@@QEAA@XZ)
         symbolWithPointer(??1Mutex@WTF@@QAE@XZ, ??1Mutex@WTF@@QEAA@XZ)
         symbolWithPointer(??1ThreadCondition@WTF@@QAE@XZ, ??1ThreadCondition@WTF@@QEAA@XZ)
+        ?workerThreadCount@WorkerThread@WebCore@@SAIXZ
 #if USE(CAIRO)
         symbolWithPointer(??$derefIfNotNull@U_cairo_surface@@@WTF@@YAXPAU_cairo_surface@@@Z, ??$derefIfNotNull@U_cairo_surface@@@WTF@@YAXPEAU_cairo_surface@@@Z)
         symbolWithPointer(??$refIfNotNull@U_cairo_surface@@@WTF@@YAXPAU_cairo_surface@@@Z, ??$refIfNotNull@U_cairo_surface@@@WTF@@YAXPEAU_cairo_surface@@@Z)
@@ -438,10 +439,6 @@ EXPORTS
         symbolWithPointer(?toUInt64@WebCore@@YA_KPAVExecState@JSC@@VJSValue@3@W4IntegerConversionConfiguration@1@@Z, ?toUInt64@WebCore@@YA_KPEAVExecState@JSC@@VJSValue@3@W4IntegerConversionConfiguration@1@@Z)
         symbolWithPointer(?commonVM@JSDOMWindowBase@WebCore@@SAPAVVM@JSC@@XZ, ?commonVM@JSDOMWindowBase@WebCore@@SAPEAVVM@JSC@@XZ)
 
-#if ENABLE(WORKERS)
-        ?workerThreadCount@WorkerThread@WebCore@@SAIXZ
-#endif
-
 #if ENABLE(VIDEO)
         symbolWithPointer(?toTimeRanges@WebCore@@YAPAVTimeRanges@1@VJSValue@JSC@@@Z, ?toTimeRanges@WebCore@@YAPEAVTimeRanges@1@VJSValue@JSC@@@Z)
         symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVTimeRanges@1@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVTimeRanges@1@@Z)
index dbf0c6f..be288e1 100644 (file)
@@ -1,3 +1,13 @@
+2013-11-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove ENABLE_WORKERS
+        https://bugs.webkit.org/show_bug.cgi?id=105784
+
+        Reviewed by Darin Adler.
+
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_memory_cache_clear):
+
 2013-11-18  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL] Initialize efreet before getting directories
index 3c3f675..57f00ab 100644 (file)
@@ -313,9 +313,7 @@ void ewk_settings_memory_cache_clear()
 
     // FastMalloc has lock-free thread specific caches that can only be cleared from the thread itself.
     WebCore::StorageThread::releaseFastMallocFreeMemoryInAllThreads();
-#if ENABLE(WORKERS)
     WebCore::WorkerThread::releaseFastMallocFreeMemoryInAllThreads();
-#endif
     WTF::releaseFastMallocFreeMemory();
 }
 
index ff63499..a3eb7e5 100644 (file)
@@ -1,3 +1,13 @@
+2013-11-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove ENABLE_WORKERS
+        https://bugs.webkit.org/show_bug.cgi?id=105784
+
+        Reviewed by Darin Adler.
+
+        * WebWorkersPrivate.cpp:
+        (WebWorkersPrivate::workerThreadCount):
+
 2013-11-18  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r159455.
index f55c27c..3326926 100644 (file)
@@ -73,11 +73,7 @@ HRESULT WebWorkersPrivate::workerThreadCount(UINT* number)
     if (!number)
         return E_POINTER;
 
-#if ENABLE(WORKERS)
     *number = WebCore::WorkerThread::workerThreadCount();
-#else
-    *number = 0;
-#endif
     return S_OK;
 }
 
index b7c28ff..376368e 100644 (file)
@@ -183,7 +183,6 @@ $srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \
     ENABLE_VIEW_MODE_CSS_MEDIA=1 \
     ENABLE_WEB_SOCKETS=1 \
     ENABLE_WEB_TIMING=1 \
-    ENABLE_WORKERS=1 \
     ENABLE_XHR_TIMEOUT=1
 
 dnl AM_WEBKIT_FEATURE_CONDITIONAL
index 97b1b04..bc49288 100644 (file)
@@ -129,7 +129,6 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_SOCKETS "Toggle Web Sockets support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_TIMING "Toggle Web Timing support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_WORKERS "Toggle Web Workers support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_XHR_TIMEOUT "Toggle XHR timeout support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" ON)
     WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of TCmalloc" OFF)
index 782cf92..14fd676 100644 (file)
 #cmakedefine01 ENABLE_WEB_AUDIO
 #cmakedefine01 ENABLE_WEB_SOCKETS
 #cmakedefine01 ENABLE_WEB_TIMING
-#cmakedefine01 ENABLE_WORKERS
 #cmakedefine01 ENABLE_XHR_TIMEOUT
 #cmakedefine01 ENABLE_XSLT
 #cmakedefine01 USE_SYSTEM_MALLOC
index fb88866..59b0eda 100644 (file)
@@ -1,3 +1,12 @@
+2013-11-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove ENABLE_WORKERS
+        https://bugs.webkit.org/show_bug.cgi?id=105784
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitperl/FeatureList.pm:
+
 2013-11-21  Darin Adler  <darin@apple.com>
 
         Try to fix buildbot Dashboard for people who have not hidden anything.
index f8572c9..6b7e8f5 100644 (file)
@@ -152,7 +152,6 @@ my (
     $webAudioSupport,
     $webSocketsSupport,
     $webTimingSupport,
-    $workersSupport,
     $xhrTimeoutSupport,
     $xsltSupport,
     $ftlJITSupport,
@@ -478,9 +477,6 @@ my @features = (
     { option => "web-timing", desc => "Toggle Web Timing support",
       define => "ENABLE_WEB_TIMING", default => (isBlackBerry() || isGtk() || isEfl()), value => \$webTimingSupport },
 
-    { option => "workers", desc => "Toggle Workers support",
-      define => "ENABLE_WORKERS", default => (isAppleWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$workersSupport },
-
     { option => "xhr-timeout", desc => "Toggle XHR Timeout support",
       define => "ENABLE_XHR_TIMEOUT", default => (isEfl() || isGtk() || isAppleMacWebKit()), value => \$xhrTimeoutSupport },
 
index 2dfed8a..2cdd8bb 100644 (file)
@@ -1,3 +1,13 @@
+2013-11-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove ENABLE_WORKERS
+        https://bugs.webkit.org/show_bug.cgi?id=105784
+
+        Reviewed by Darin Adler.
+
+        * win/tools/vsprops/FeatureDefines.props:
+        * win/tools/vsprops/FeatureDefinesCairo.props:
+
 2013-11-17  Filip Pizlo  <fpizlo@apple.com>
 
         Update binary drops to include atrick's "Ran out of registers" fix in r194942.
index dc01ef8..b9e74c2 100644 (file)
@@ -83,7 +83,6 @@
     <ENABLE_WEB_AUDIO />
     <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
     <ENABLE_WEB_TIMING />
-    <ENABLE_WORKERS>ENABLE_WORKERS</ENABLE_WORKERS>
     <ENABLE_XHR_TIMEOUT>ENABLE_XHR_TIMEOUT</ENABLE_XHR_TIMEOUT>
     <ENABLE_XSLT>ENABLE_XSLT</ENABLE_XSLT>
   </PropertyGroup>
@@ -92,7 +91,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
       <Value>$(ENABLE_WEB_TIMING)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
-    <BuildMacro Include="ENABLE_WORKERS">
-      <Value>$(ENABLE_WORKERS)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
     <BuildMacro Include="ENABLE_XHR_TIMEOUT">
       <Value>$(ENABLE_XHR_TIMEOUT)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
index 9adcbe7..e390769 100644 (file)
@@ -82,7 +82,6 @@
     <ENABLE_WEB_AUDIO />
     <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
     <ENABLE_WEB_TIMING />
-    <ENABLE_WORKERS>ENABLE_WORKERS</ENABLE_WORKERS>
     <ENABLE_XHR_TIMEOUT>ENABLE_XHR_TIMEOUT</ENABLE_XHR_TIMEOUT>
     <ENABLE_XSLT>ENABLE_XSLT</ENABLE_XSLT>
   </PropertyGroup>
@@ -91,7 +90,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
       <Value>$(ENABLE_WEB_TIMING)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>
     </BuildMacro>
-    <BuildMacro Include="ENABLE_WORKERS">
-      <Value>$(ENABLE_WORKERS)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
     <BuildMacro Include="ENABLE_XHR_TIMEOUT">
       <Value>$(ENABLE_XHR_TIMEOUT)</Value>
       <EnvironmentVariable>true</EnvironmentVariable>