diff --git a/ChangeLog b/ChangeLog index da531e3cacd379e9c34677e9b76cc1965ce5d731..7dd7cbfbe259c170aa7c2e8ce460a625446553db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2013-11-21 Peter Molnar + + 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 Unreviewed, rolling out r159496. diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index 3b03ced57bc1dd8e912afeb9b58dae06c8e7bd45..c145c4bddd8c7efeeb630fb0d94f274331c46948 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,13 @@ +2013-11-21 Peter Molnar + + 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 Fix an error in a few Xcode configuration setting files. diff --git a/Source/WTF/wtf/FeatureDefines.h b/Source/WTF/wtf/FeatureDefines.h index 750254fb9b110fc7a178970d85ed854da1ffce7f..45f5b98a8c5c546ce89f78ad8d40b6c61aaf534f 100644 --- a/Source/WTF/wtf/FeatureDefines.h +++ b/Source/WTF/wtf/FeatureDefines.h @@ -863,10 +863,6 @@ #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 diff --git a/Source/WTF/wtf/nix/FeatureDefinesNix.h b/Source/WTF/wtf/nix/FeatureDefinesNix.h index 745d8d05f2eccafade3a3009eff9f0d6d9fff48c..f16e154d5134b1ef421f1838c62531e5d32ddfab 100644 --- a/Source/WTF/wtf/nix/FeatureDefinesNix.h +++ b/Source/WTF/wtf/nix/FeatureDefinesNix.h @@ -278,10 +278,6 @@ #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 diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index 4219255ebdcbecd5ee501756ef1a95a0e87724f2..94ebbb33fecb39f8744aebee80580bca1a7d364d 100644 --- a/Source/WebCore/CMakeLists.txt +++ b/Source/WebCore/CMakeLists.txt @@ -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 ) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 7f2a44b4043e5aeb70ee1d7bc0bf2a82a1044755..5936fa4627548d65b9a77254d856a797f02c2c39 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,10 @@ +2013-11-21 Peter Molnar + + Remove ENABLE_WORKERS + https://bugs.webkit.org/show_bug.cgi?id=105784 + + Reviewed by Darin Adler. + 2013-11-21 Alex Christensen [Win] Unreviewed build fix after r159632. diff --git a/Source/WebCore/Modules/indexeddb/IDBFactory.cpp b/Source/WebCore/Modules/indexeddb/IDBFactory.cpp index e7dfead4ee0485c4e1c44204d3d70ec0a61d56d4..9f406fa3432d56fc95b00b015295610919657b73 100644 --- a/Source/WebCore/Modules/indexeddb/IDBFactory.cpp +++ b/Source/WebCore/Modules/indexeddb/IDBFactory.cpp @@ -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(context); const GroupSettings* groupSettings = workerGlobalScope->groupSettings(); if (groupSettings) return groupSettings->indexedDBDatabasePath(); -#endif return String(); } } diff --git a/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp b/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp index 27eb5e1602ce193593d6f8df81d979c31b7092a6..2074b15c53b40abf6f4ab176b622ca9dd5ef6979 100644 --- a/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp +++ b/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp @@ -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) diff --git a/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h b/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h index 3f689eebe0d84f55d2d47a7550867af958c7cbf0..c00b0ab56a34a105c39f8472d8862029c9b0709e 100644 --- a/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h +++ b/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h @@ -27,7 +27,7 @@ #ifndef WorkerGlobalScopeIndexedDatabase_h #define WorkerGlobalScopeIndexedDatabase_h -#if ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE) +#if ENABLE(INDEXED_DATABASE) #include "Supplementable.h" #include @@ -58,6 +58,6 @@ private: } // namespace WebCore -#endif // ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE) +#endif // ENABLE(INDEXED_DATABASE) #endif // WorkerGlobalScopeIndexedDatabase_h diff --git a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp index a035c080174b6bb70aa838c2f1e6d7591d45752f..d30ae81916d8976a4c25751ac74ea551ce58b6ca 100644 --- a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp +++ b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp @@ -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 WorkerGlobalScopeWebDatabase::openDatabaseSync(WorkerGl } // namespace WebCore -#endif // ENABLE(SQL_DATABASE) && ENABLE(WORKERS) +#endif // ENABLE(SQL_DATABASE) diff --git a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h index 70166bf01f14d7547ec3645009c5985b676cdc13..fcccab1e32c3802bb4d50b830e131fbb7958bc0d 100644 --- a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h +++ b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h @@ -27,7 +27,7 @@ #ifndef WorkerGlobalScopeWebDatabase_h #define WorkerGlobalScopeWebDatabase_h -#if ENABLE(SQL_DATABASE) && ENABLE(WORKERS) +#if ENABLE(SQL_DATABASE) #include "ExceptionCode.h" #include @@ -54,6 +54,6 @@ private: } // namespace WebCore -#endif // ENABLE(SQL_DATABASE) && ENABLE(WORKERS) +#endif // ENABLE(SQL_DATABASE) #endif // WorkerGlobalScopeWebDatabase_h diff --git a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl index c3140b93e01b8770519f4e46895787a5e0d7f7cf..d22d087657b3beb60a4bcc8c82a4877b09f9847a 100644 --- a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl +++ b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl @@ -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); diff --git a/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp b/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp index de821d2c055a7c18fba002086c1ede9f08d495e7..919c605013a6b55b4f1891e12b702729c272ce2b 100644 --- a/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp +++ b/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp @@ -55,7 +55,6 @@ PassRefPtr ThreadableWebSocketChannel::create(Script ASSERT(context); ASSERT(client); -#if ENABLE(WORKERS) if (context->isWorkerGlobalScope()) { WorkerGlobalScope* workerGlobalScope = static_cast(context); WorkerRunLoop& runLoop = workerGlobalScope->thread()->runLoop(); @@ -63,7 +62,6 @@ PassRefPtr ThreadableWebSocketChannel::create(Script mode.append(String::number(runLoop.createUniqueId())); return WorkerThreadableWebSocketChannel::create(workerGlobalScope, client, mode); } -#endif // ENABLE(WORKERS) return WebSocketChannel::create(toDocument(context), client); } diff --git a/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp b/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp index 6ed3ca27ff25abb0e47330a2686149d715510e6c..15b6d3c93c1eda20ba5a9068d4b6fa7f44113e26 100644 --- a/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp +++ b/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp @@ -29,7 +29,7 @@ */ #include "config.h" -#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS) +#if ENABLE(WEB_SOCKETS) #include "ThreadableWebSocketChannelClientWrapper.h" #include "CrossThreadCopier.h" diff --git a/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h b/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h index d364c6564785429592129dfe0c0e9b6a07fd70ee..29f54950a8bca34aac0d5bd4e704ee18544601da 100644 --- a/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h +++ b/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h @@ -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" diff --git a/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp b/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp index eb6ac5759d6ac3e342a2425d15c128485a2ff1f2..8873c16e484a365b4d1d62a7d8ad167aec72e6fe 100644 --- a/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp +++ b/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp @@ -30,7 +30,7 @@ #include "config.h" -#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS) +#if ENABLE(WEB_SOCKETS) #include "WorkerThreadableWebSocketChannel.h" diff --git a/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h b/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h index fd93fdd8cad39997db15108f81b43453294f7bf5..ca526db214dd1afd8339c86f343397cf586351f6 100644 --- a/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h +++ b/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h @@ -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" diff --git a/Source/WebCore/UseJSC.cmake b/Source/WebCore/UseJSC.cmake index 09b4addbb7bc9954ccb0ca691cf3fcc25cb38725..a971fa0c3b1bdf59e1fed1fe4b0c04629ff8c9ce 100644 --- a/Source/WebCore/UseJSC.cmake +++ b/Source/WebCore/UseJSC.cmake @@ -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 diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in index 9738692927644eafd1c1116757748e1bd15f4bc1..70d733d35d5927adc4ed274f3faf8703f54982f4 100644 --- a/Source/WebCore/WebCore.exp.in +++ b/Source/WebCore/WebCore.exp.in @@ -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 diff --git a/Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp b/Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp index 1ef1076af9d44ee2a2575b70d5410a687dfb34a1..2194efe4d845a43312d071775ca1ab1fb876cb22 100644 --- a/Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp +++ b/Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp @@ -33,9 +33,11 @@ #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" @@ -46,11 +48,6 @@ #include -#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); diff --git a/Source/WebCore/bindings/generic/ActiveDOMCallback.cpp b/Source/WebCore/bindings/generic/ActiveDOMCallback.cpp index 0e326f7f03e072aadedb1ecee21985aa8b79b42e..81a10c14b2db5f171dc0688c8061e73d01fa69cf 100644 --- a/Source/WebCore/bindings/generic/ActiveDOMCallback.cpp +++ b/Source/WebCore/bindings/generic/ActiveDOMCallback.cpp @@ -33,10 +33,7 @@ #include "ActiveDOMObject.h" #include "ScriptExecutionContext.h" - -#if ENABLE(WORKERS) #include "WorkerGlobalScope.h" -#endif namespace WebCore { diff --git a/Source/WebCore/bindings/js/DOMRequestState.h b/Source/WebCore/bindings/js/DOMRequestState.h index 05b6b0988d83d281ba9396a9148ca3c609404292..3453f5b533db5339f77b12a2c0f8f9cffabd08bf 100644 --- a/Source/WebCore/bindings/js/DOMRequestState.h +++ b/Source/WebCore/bindings/js/DOMRequestState.h @@ -31,9 +31,7 @@ #include "DOMWrapperWorld.h" #include "Document.h" #include "ScriptState.h" -#if ENABLE(WORKERS) #include "WorkerGlobalScope.h" -#endif #include @@ -51,10 +49,8 @@ public: Document* document = toDocument(m_scriptExecutionContext); m_exec = execStateFromPage(mainThreadNormalWorld(), document->page()); } else { -#if ENABLE(WORKERS) WorkerGlobalScope* workerGlobalScope = static_cast(m_scriptExecutionContext); m_exec = execStateFromWorkerGlobalScope(workerGlobalScope); -#endif } } diff --git a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp b/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp index fcbd14365cbc1f69a1986deb246a9ce243b46ae0..2cc95b1c70474fca6c5a95b12fe8097c524f2312 100644 --- a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp +++ b/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp @@ -30,11 +30,8 @@ #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(this)->scriptExecutionContext(); -#if ENABLE(WORKERS) if (inherits(JSWorkerGlobalScopeBase::info())) return jsCast(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(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(scriptExecutionContext)->script()->workerGlobalScopeWrapper(); -#endif ASSERT_NOT_REACHED(); return 0; diff --git a/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp b/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp index b65d4c98bce013047acd6130b2aacf9d6a840f72..35abfd3165b2d8a8a1894f0eecef3eead89a373e 100644 --- a/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp +++ b/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp @@ -31,15 +31,12 @@ #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 diff --git a/Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp b/Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp index 45c6aa72e19d064ef045055b61c30b540ddb6fd5..ea62e28edc60d1bf7e6851e7d134ca41046a81d5 100644 --- a/Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp +++ b/Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp @@ -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) diff --git a/Source/WebCore/bindings/js/JSEventListener.cpp b/Source/WebCore/bindings/js/JSEventListener.cpp index 703c2abc0371fc8109d80a76f83f84d1429af78d..00d16c849ed192f126352e53429bb581d5306f85 100644 --- a/Source/WebCore/bindings/js/JSEventListener.cpp +++ b/Source/WebCore/bindings/js/JSEventListener.cpp @@ -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(scriptExecutionContext)->script()->forbidExecution(); } -#endif if (exec->hadException()) { event->target()->uncaughtExceptionInEventHandler(); diff --git a/Source/WebCore/bindings/js/JSWorkerCustom.cpp b/Source/WebCore/bindings/js/JSWorkerCustom.cpp index a40a05e90dab2b83e21a2f2bd3f552b23078aa98..caa5318f1dfc636f4c67132f136a5a89d318ee55 100644 --- a/Source/WebCore/bindings/js/JSWorkerCustom.cpp +++ b/Source/WebCore/bindings/js/JSWorkerCustom.cpp @@ -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) diff --git a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp index ff5fdbe610fdc7af0bd3ca4404709d58bc9c777f..c360402638f3b49591065809a7e766ba8f47c4f3 100644 --- a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp +++ b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp @@ -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) diff --git a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h index 7bc980973bfaa9cc3c61f2c3c9c77caecefbe646..56804a4624ca02e7069ee7c0f1e4c4e14027b3e7 100644 --- a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h +++ b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h @@ -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 diff --git a/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp b/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp index d6836e18f52602b1473b505796d0a8fd62740244..d12d98e848c7f6992c3f1854c9c2b50dc6b48dd6 100644 --- a/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp +++ b/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp @@ -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) diff --git a/Source/WebCore/bindings/js/ScheduledAction.cpp b/Source/WebCore/bindings/js/ScheduledAction.cpp index 9242f24ee15f972da48ed0c7671fc7df753307dc..06c51ca7b21766e934033dbef41527f3954a2b28 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 - -#if ENABLE(WORKERS) -#include "JSWorkerGlobalScope.h" #include "WorkerGlobalScope.h" #include "WorkerThread.h" -#endif +#include 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(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 diff --git a/Source/WebCore/bindings/js/ScheduledAction.h b/Source/WebCore/bindings/js/ScheduledAction.h index e93a83a7d0b281f5327e2bcd1f29234c53cec5a6..19add3fe825ce8f1da37181eb06aacfbf212ec6d 100644 --- a/Source/WebCore/bindings/js/ScheduledAction.h +++ b/Source/WebCore/bindings/js/ScheduledAction.h @@ -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 m_function; Vector> m_args; diff --git a/Source/WebCore/bindings/js/ScriptProfiler.cpp b/Source/WebCore/bindings/js/ScriptProfiler.cpp index 2f9780c71bd80558d2803c219af859b3911985df..fde27d036b8b20e87523839cf9ea923b06912417 100644 --- a/Source/WebCore/bindings/js/ScriptProfiler.cpp +++ b/Source/WebCore/bindings/js/ScriptProfiler.cpp @@ -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 ScriptProfiler::stop(JSC::ExecState* state, const String& title) { @@ -87,12 +85,10 @@ PassRefPtr ScriptProfiler::stopForPage(Page* inspectedPage, const return stop(scriptState, title); } -#if ENABLE(WORKERS) PassRefPtr ScriptProfiler::stopForWorkerGlobalScope(WorkerGlobalScope* context, const String& title) { return stop(execStateFromWorkerGlobalScope(context), title); } -#endif } // namespace WebCore diff --git a/Source/WebCore/bindings/js/ScriptProfiler.h b/Source/WebCore/bindings/js/ScriptProfiler.h index 7df2b34b824d185efe7762078245d1856e054893..727c6eef2c57f7cd2e788a3667f86a08394633f1 100644 --- a/Source/WebCore/bindings/js/ScriptProfiler.h +++ b/Source/WebCore/bindings/js/ScriptProfiler.h @@ -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 stop(JSC::ExecState*, const String& title); static PassRefPtr stopForPage(Page*, const String& title); -#if ENABLE(WORKERS) static PassRefPtr stopForWorkerGlobalScope(WorkerGlobalScope*, const String& title); -#endif static PassRefPtr takeHeapSnapshot(const String&, HeapSnapshotProgress*) { return 0; } static bool causesRecompilation() { return true; } static bool isSampling() { return false; } diff --git a/Source/WebCore/bindings/js/ScriptState.cpp b/Source/WebCore/bindings/js/ScriptState.cpp index f369b73462b06411008f8494864aa8d4a1fc868e..af1048dce5f32ac9cc022c56d44f7f18ff7271e2 100644 --- a/Source/WebCore/bindings/js/ScriptState.cpp +++ b/Source/WebCore/bindings/js/ScriptState.cpp @@ -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 #include -#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 } diff --git a/Source/WebCore/bindings/js/ScriptState.h b/Source/WebCore/bindings/js/ScriptState.h index 4f41fda174118292f16205170eab5de89ef8dcf3..349d94a8f8e28a5152e50bff03057722dcde3ee7 100644 --- a/Source/WebCore/bindings/js/ScriptState.h +++ b/Source/WebCore/bindings/js/ScriptState.h @@ -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 diff --git a/Source/WebCore/bindings/js/WorkerScriptController.cpp b/Source/WebCore/bindings/js/WorkerScriptController.cpp index 200912a23e3c9b64872f0d6ece1b4b6bbc2c22b3..290b1f11444a6a4cb23e977d1da8b7945b0b4398 100644 --- a/Source/WebCore/bindings/js/WorkerScriptController.cpp +++ b/Source/WebCore/bindings/js/WorkerScriptController.cpp @@ -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) diff --git a/Source/WebCore/bindings/js/WorkerScriptController.h b/Source/WebCore/bindings/js/WorkerScriptController.h index 34305b6c6a8ba9ca440e05cb720ba27f4bc98255..8bb7f49b085fc5cdd87227719e3315f1a26b8f85 100644 --- a/Source/WebCore/bindings/js/WorkerScriptController.h +++ b/Source/WebCore/bindings/js/WorkerScriptController.h @@ -28,7 +28,6 @@ #ifndef WorkerScriptController_h #define WorkerScriptController_h -#if ENABLE(WORKERS) #include #include #include @@ -99,6 +98,4 @@ namespace WebCore { } // namespace WebCore -#endif // ENABLE(WORKERS) - #endif // WorkerScriptController_h diff --git a/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp b/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp index b417f431ef64c22dbdf023734ace524489026993..68a48535ef747e0052d7afbf8110cca9337da9a4 100644 --- a/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp +++ b/Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp @@ -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 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(m_scriptExecutionContext)->isClosing()) return; -#endif OwnPtr ports = MessagePort::entanglePorts(*m_scriptExecutionContext, channels.release()); RefPtr evt = MessageEvent::create(ports.release(), message.release()); diff --git a/Source/WebCore/dom/ScriptExecutionContext.cpp b/Source/WebCore/dom/ScriptExecutionContext.cpp index c9020feae640cbbe53e50acba2754426ec51d3e2..b5eba5d4e342023bf1e5d7932f181c62555908ec 100644 --- a/Source/WebCore/dom/ScriptExecutionContext.cpp +++ b/Source/WebCore/dom/ScriptExecutionContext.cpp @@ -143,10 +143,8 @@ void ScriptExecutionContext::dispatchMessagePortEvents() void ScriptExecutionContext::createdMessagePort(MessagePort* port) { ASSERT(port); -#if ENABLE(WORKERS) ASSERT((isDocument() && isMainThread()) || (isWorkerGlobalScope() && currentThread() == static_cast(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(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(this)->script()->vm(); -#endif ASSERT_NOT_REACHED(); return 0; diff --git a/Source/WebCore/inspector/CodeGeneratorInspector.py b/Source/WebCore/inspector/CodeGeneratorInspector.py index d475b3cb58f40786d02883181d67dacfd4d96729..f890f4ff8b440c08c2924258416aa33321f461f6 100755 --- a/Source/WebCore/inspector/CodeGeneratorInspector.py +++ b/Source/WebCore/inspector/CodeGeneratorInspector.py @@ -48,7 +48,6 @@ DOMAIN_DEFINE_NAME_MAP = { "DOMDebugger": "JAVASCRIPT_DEBUGGER", "IndexedDB": "INDEXED_DATABASE", "Profiler": "JAVASCRIPT_DEBUGGER", - "Worker": "WORKERS", } diff --git a/Source/WebCore/inspector/InspectorConsoleInstrumentation.h b/Source/WebCore/inspector/InspectorConsoleInstrumentation.h index 08f988394704997b852118f351015fe7fb6dfc28..ff20757939b2dc12cfc423124901f4a569c098f7 100644 --- a/Source/WebCore/inspector/InspectorConsoleInstrumentation.h +++ b/Source/WebCore/inspector/InspectorConsoleInstrumentation.h @@ -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 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 arguments) { diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp index 71b69fb7244bff8fed1ce02533c547dd73e1bd00..d7516a586c6d4762ede4fd8e2fb72f14a312d573 100644 --- a/Source/WebCore/inspector/InspectorController.cpp +++ b/Source/WebCore/inspector/InspectorController.cpp @@ -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())); diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp index 529ce36c87a93b257a7f97e0af5f248cf0600137..c4c51cbe76c3f08b579f17b0af6127ce8a448cc0 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp @@ -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(context)); return 0; } -#endif #if ENABLE(GEOLOCATION) GeolocationPosition* InspectorInstrumentation::overrideGeolocationPositionImpl(InstrumentingAgents* instrumentingAgents, GeolocationPosition* position) diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h index 07dbf448cdd8a8985331f1a99ab678499bb25ecd..bd5c952e4b76c4db7580959a90260faadaac38a4 100644 --- a/Source/WebCore/inspector/InspectorInstrumentation.h +++ b/Source/WebCore/inspector/InspectorInstrumentation.h @@ -233,11 +233,11 @@ public: static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr, unsigned long requestIdentifier = 0); static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr, 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, 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); static void startConsoleTiming(Frame*, const String& title); static void stopConsoleTiming(Frame*, const String& title, PassRefPtr); @@ -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) diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.cpp b/Source/WebCore/inspector/InspectorProfilerAgent.cpp index 529cae6e62b9b5f113f2b5f1c2c2607ce17d40d8..baf51f485eb2897fff020f1c3edea946231f48de 100644 --- a/Source/WebCore/inspector/InspectorProfilerAgent.cpp +++ b/Source/WebCore/inspector/InspectorProfilerAgent.cpp @@ -91,7 +91,6 @@ PassOwnPtr 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::create(InstrumentingA { return adoptPtr(new WorkerProfilerAgent(instrumentingAgents, consoleAgent, workerGlobalScope, injectedScriptManager)); } -#endif InspectorProfilerAgent::InspectorProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, InjectedScriptManager* injectedScriptManager) : InspectorBaseAgent(ASCIILiteral("Profiler"), instrumentingAgents) diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.h b/Source/WebCore/inspector/InspectorProfilerAgent.h index e0550b67a90c33da46b2d29b1ae3d3152698fa8d..53709c50bbea5e183bd1971780dfc1edffad4582 100644 --- a/Source/WebCore/inspector/InspectorProfilerAgent.h +++ b/Source/WebCore/inspector/InspectorProfilerAgent.h @@ -58,9 +58,8 @@ class InspectorProfilerAgent : public InspectorBaseAgent, public InspectorProfil WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent); WTF_MAKE_FAST_ALLOCATED; public: static PassOwnPtr create(InstrumentingAgents*, InspectorConsoleAgent*, Page*, InjectedScriptManager*); -#if ENABLE(WORKERS) static PassOwnPtr create(InstrumentingAgents*, InspectorConsoleAgent*, WorkerGlobalScope*, InjectedScriptManager*); -#endif + virtual ~InspectorProfilerAgent(); void addProfile(PassRefPtr prpProfile, unsigned lineNumber, unsigned columnNumber, const String& sourceURL); diff --git a/Source/WebCore/inspector/InspectorWorkerAgent.cpp b/Source/WebCore/inspector/InspectorWorkerAgent.cpp index f648549fca671edd8ecc2b69f958326aaf001d02..68cadabcfe77e658a95ba25306feb628a08db9b2 100644 --- a/Source/WebCore/inspector/InspectorWorkerAgent.cpp +++ b/Source/WebCore/inspector/InspectorWorkerAgent.cpp @@ -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) diff --git a/Source/WebCore/inspector/InspectorWorkerAgent.h b/Source/WebCore/inspector/InspectorWorkerAgent.h index 78559de48d9be5f86f2dc1ae7f07f7024173ca60..ab6221a2fd512ec68c69d116080cf8926f855bf2 100644 --- a/Source/WebCore/inspector/InspectorWorkerAgent.h +++ b/Source/WebCore/inspector/InspectorWorkerAgent.h @@ -31,8 +31,6 @@ #ifndef InspectorWorkerAgent_h #define InspectorWorkerAgent_h -#if ENABLE(WORKERS) - #include "InspectorBaseAgent.h" #include #include @@ -89,5 +87,3 @@ private: } // namespace WebCore #endif // !defined(InspectorWorkerAgent_h) - -#endif // ENABLE(WORKERS) diff --git a/Source/WebCore/inspector/InspectorWorkerResource.h b/Source/WebCore/inspector/InspectorWorkerResource.h index 2b8041fdf7283cb7766e33819a618ee4e41c42fc..bf116b3a02688eabe5678039bcede6ea02b7354d 100644 --- a/Source/WebCore/inspector/InspectorWorkerResource.h +++ b/Source/WebCore/inspector/InspectorWorkerResource.h @@ -31,7 +31,7 @@ #ifndef InspectorWorkerResource_h #define InspectorWorkerResource_h -#if ENABLE(WORKERS) && ENABLE(INSPECTOR) +#if ENABLE(INSPECTOR) #include #include @@ -65,6 +65,6 @@ private: } // namespace WebCore -#endif // ENABLE(WORKERS) && ENABLE(INSPECTOR) +#endif // ENABLE(INSPECTOR) #endif // InspectorWorkerResource_h diff --git a/Source/WebCore/inspector/InstrumentingAgents.cpp b/Source/WebCore/inspector/InstrumentingAgents.cpp index ac064df67cef65742c72584b04f42a4dbc7a5d66..8cfb328bdb0ed7cc43ca9adcfb6697a42d790e22 100644 --- a/Source/WebCore/inspector/InstrumentingAgents.cpp +++ b/Source/WebCore/inspector/InstrumentingAgents.cpp @@ -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 diff --git a/Source/WebCore/inspector/InstrumentingAgents.h b/Source/WebCore/inspector/InstrumentingAgents.h index c2494728ab8dc5510d206c1cb5c5b7bbe3d7b065..86c9143d104ec827d0f8f839c1e3b7ef3f63d0c8 100644 --- a/Source/WebCore/inspector/InstrumentingAgents.h +++ b/Source/WebCore/inspector/InstrumentingAgents.h @@ -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 } diff --git a/Source/WebCore/inspector/WorkerConsoleAgent.cpp b/Source/WebCore/inspector/WorkerConsoleAgent.cpp index c1dd54887909b6ad174a8ad0ccbfdb887f3fb249..15bb7a88f4d50b910245df47ae17c143e5eb48f2 100644 --- a/Source/WebCore/inspector/WorkerConsoleAgent.cpp +++ b/Source/WebCore/inspector/WorkerConsoleAgent.cpp @@ -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) diff --git a/Source/WebCore/inspector/WorkerConsoleAgent.h b/Source/WebCore/inspector/WorkerConsoleAgent.h index 16a8a3ec72ee2bc9979b1d8987e175bc8417181e..1e9c10c9f46de6d155df1e59a2d29ca81c6997a5 100644 --- a/Source/WebCore/inspector/WorkerConsoleAgent.h +++ b/Source/WebCore/inspector/WorkerConsoleAgent.h @@ -34,7 +34,7 @@ #include "InspectorConsoleAgent.h" #include -#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) diff --git a/Source/WebCore/inspector/WorkerDebuggerAgent.cpp b/Source/WebCore/inspector/WorkerDebuggerAgent.cpp index 5779198f673193c7cbb1ef4af1e21fbe142b750d..7136e468c1a1c25a19b3c369eaaf15dddb1952b9 100644 --- a/Source/WebCore/inspector/WorkerDebuggerAgent.cpp +++ b/Source/WebCore/inspector/WorkerDebuggerAgent.cpp @@ -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) diff --git a/Source/WebCore/inspector/WorkerDebuggerAgent.h b/Source/WebCore/inspector/WorkerDebuggerAgent.h index c7df0f33ec0f0640496cb2eb8d2e2612f0a3fb9b..e5eb6f063f8c62afa895e6c73394fced21f29971 100644 --- a/Source/WebCore/inspector/WorkerDebuggerAgent.h +++ b/Source/WebCore/inspector/WorkerDebuggerAgent.h @@ -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) diff --git a/Source/WebCore/inspector/WorkerInspectorController.cpp b/Source/WebCore/inspector/WorkerInspectorController.cpp index 4f5deae90614d529d4419590a62435879cdb94ea..c294fe4063cf574a61319ffadd41ff47addcab4f 100644 --- a/Source/WebCore/inspector/WorkerInspectorController.cpp +++ b/Source/WebCore/inspector/WorkerInspectorController.cpp @@ -30,7 +30,7 @@ #include "config.h" -#if ENABLE(INSPECTOR) && ENABLE(WORKERS) +#if ENABLE(INSPECTOR) #include "WorkerInspectorController.h" diff --git a/Source/WebCore/inspector/WorkerInspectorController.h b/Source/WebCore/inspector/WorkerInspectorController.h index 160f4ecca71c9bebebc4c6fae9a6697f8789ee31..f5175e7cf3538daaa4e298ff797bee0fb3ce494e 100644 --- a/Source/WebCore/inspector/WorkerInspectorController.h +++ b/Source/WebCore/inspector/WorkerInspectorController.h @@ -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) diff --git a/Source/WebCore/inspector/WorkerRuntimeAgent.cpp b/Source/WebCore/inspector/WorkerRuntimeAgent.cpp index 0ab9033fb57cb77b9f87d2bfa4a1af751388fc3f..b07b633e6a8e56df7af61d01ba03e6607a932625 100644 --- a/Source/WebCore/inspector/WorkerRuntimeAgent.cpp +++ b/Source/WebCore/inspector/WorkerRuntimeAgent.cpp @@ -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) diff --git a/Source/WebCore/inspector/WorkerRuntimeAgent.h b/Source/WebCore/inspector/WorkerRuntimeAgent.h index 3172275a0c40487212b1b4e61cb4f5dc09b608d2..67de08a99fb39bf3b989757532288b6b4f91cfc8 100644 --- a/Source/WebCore/inspector/WorkerRuntimeAgent.h +++ b/Source/WebCore/inspector/WorkerRuntimeAgent.h @@ -31,7 +31,7 @@ #ifndef WorkerRuntimeAgent_h #define WorkerRuntimeAgent_h -#if ENABLE(INSPECTOR) && ENABLE(WORKERS) +#if ENABLE(INSPECTOR) #include "InspectorRuntimeAgent.h" #include diff --git a/Source/WebCore/loader/ThreadableLoader.cpp b/Source/WebCore/loader/ThreadableLoader.cpp index d00a06eb30f52937a9ec67eec555b9a816f3a689..8a3a985767142fc7866d5c83cee77d387a3c4f97 100644 --- a/Source/WebCore/loader/ThreadableLoader.cpp +++ b/Source/WebCore/loader/ThreadableLoader.cpp @@ -56,10 +56,8 @@ PassRefPtr ThreadableLoader::create(ScriptExecutionContext* co ASSERT(client); ASSERT(context); -#if ENABLE(WORKERS) if (context->isWorkerGlobalScope()) return WorkerThreadableLoader::create(static_cast(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(context), request, client, options); return; } -#endif // ENABLE(WORKERS) DocumentThreadableLoader::loadResourceSynchronously(toDocument(context), request, client, options); } diff --git a/Source/WebCore/loader/WorkerThreadableLoader.cpp b/Source/WebCore/loader/WorkerThreadableLoader.cpp index 416cb06720ff0179f998d9eda28d94e8b4eccdfb..d10ef7ed21fc639b7c23b33c9c24373f44175650 100644 --- a/Source/WebCore/loader/WorkerThreadableLoader.cpp +++ b/Source/WebCore/loader/WorkerThreadableLoader.cpp @@ -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) diff --git a/Source/WebCore/loader/WorkerThreadableLoader.h b/Source/WebCore/loader/WorkerThreadableLoader.h index c7bc9cd9c6fe7b3faddaed494d5d7968a662b3e2..cc723b4226befdd2dcf1621196d3830c31da2199 100644 --- a/Source/WebCore/loader/WorkerThreadableLoader.h +++ b/Source/WebCore/loader/WorkerThreadableLoader.h @@ -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 diff --git a/Source/WebCore/loader/cache/MemoryCache.cpp b/Source/WebCore/loader/cache/MemoryCache.cpp index 8506f01d9d29efdb093e616d88d523703261df3e..28665cc679c5f6c87eac43795944795ccd4b1ab7 100644 --- a/Source/WebCore/loader/cache/MemoryCache.cpp +++ b/Source/WebCore/loader/cache/MemoryCache.cpp @@ -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(context); workerGlobalScope->thread()->workerLoaderProxy().postTaskToLoader(createCallbackTask(&crossThreadRemoveRequestFromCache, request)); return; } -#endif removeRequestFromCacheImpl(context, request); } diff --git a/Source/WebCore/page/WorkerNavigator.cpp b/Source/WebCore/page/WorkerNavigator.cpp index 339f107c9eb338ff71129853781bcb47a5482d1c..eac5ddf3e3edd934d76c71608402946dd2f1ec62 100644 --- a/Source/WebCore/page/WorkerNavigator.cpp +++ b/Source/WebCore/page/WorkerNavigator.cpp @@ -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) diff --git a/Source/WebCore/page/WorkerNavigator.h b/Source/WebCore/page/WorkerNavigator.h index 9659079246413e9fdd1eec1db71d9b51da358451..f25d8cd4832f2d01a470d7013da70ebe30039493 100644 --- a/Source/WebCore/page/WorkerNavigator.h +++ b/Source/WebCore/page/WorkerNavigator.h @@ -26,8 +26,6 @@ #ifndef WorkerNavigator_h #define WorkerNavigator_h -#if ENABLE(WORKERS) - #include "NavigatorBase.h" #include "Supplementable.h" #include @@ -52,6 +50,4 @@ private: } // namespace WebCore -#endif // ENABLE(WORKERS) - #endif // WorkerNavigator_h diff --git a/Source/WebCore/page/WorkerNavigator.idl b/Source/WebCore/page/WorkerNavigator.idl index 265442cc2cd6cf2623b936670c30964513854e93..e2a282de7906fbf954eec6913bfe19ec10e832ad 100644 --- a/Source/WebCore/page/WorkerNavigator.idl +++ b/Source/WebCore/page/WorkerNavigator.idl @@ -28,7 +28,6 @@ [ NoInterfaceObject, - Conditional=WORKERS, GenerateIsReachable=Impl, JSNoStaticTables, ] interface WorkerNavigator { diff --git a/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm b/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm index e6e96db058556ab9b2fba87f2ef1f4c9e2a60de0..23fb4feb62fc12b7f8725a8b1495d114c890937c 100644 --- a/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm +++ b/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm @@ -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 diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp index 855fe517f0ba279bbd4bc700b49ea61b64560276..ca9969d01be6538eeed43075ed1491dd8f08b6c3 100644 --- a/Source/WebCore/testing/Internals.cpp +++ b/Source/WebCore/testing/Internals.cpp @@ -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) diff --git a/Source/WebCore/workers/AbstractWorker.cpp b/Source/WebCore/workers/AbstractWorker.cpp index 8dfce4cee971b41e858ac9cc486572e9b9a51c83..85b9b5408ee33772d1bfd930441523059c1ca285 100644 --- a/Source/WebCore/workers/AbstractWorker.cpp +++ b/Source/WebCore/workers/AbstractWorker.cpp @@ -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) diff --git a/Source/WebCore/workers/AbstractWorker.h b/Source/WebCore/workers/AbstractWorker.h index e9d67d96acc97b02c4180cb8cb7bd16ccd4c2398..0f13e8005265f3c908b52ef07d95e2cd4635d080 100644 --- a/Source/WebCore/workers/AbstractWorker.h +++ b/Source/WebCore/workers/AbstractWorker.h @@ -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 diff --git a/Source/WebCore/workers/AbstractWorker.idl b/Source/WebCore/workers/AbstractWorker.idl index 8aa6e66ca58c41a87ec747334e71a305d3fa6ba7..b2aee6833004e516b9e4510fbfb17ad2b51deeba 100644 --- a/Source/WebCore/workers/AbstractWorker.idl +++ b/Source/WebCore/workers/AbstractWorker.idl @@ -31,7 +31,6 @@ [ NoInterfaceObject, - Conditional=WORKERS, ] interface AbstractWorker { attribute EventListener onerror; }; diff --git a/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp b/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp index 12728c54babbdba07622e16ae59fae66f323697f..701569f15296e534ad917f8988469f8a0ca4f570 100644 --- a/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp +++ b/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp @@ -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) diff --git a/Source/WebCore/workers/DedicatedWorkerGlobalScope.h b/Source/WebCore/workers/DedicatedWorkerGlobalScope.h index dae7c1d5e50c668424ee15265436069ab6309cb2..d94629baa8f3ae8e7b1f2bfdab79990e4978d655 100644 --- a/Source/WebCore/workers/DedicatedWorkerGlobalScope.h +++ b/Source/WebCore/workers/DedicatedWorkerGlobalScope.h @@ -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 diff --git a/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl b/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl index 4b9c6ae7c695bd26594418129f5b3f7915a111de..ce824f662fcafc76d1dc481cf3fa3973bc02813a 100644 --- a/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl +++ b/Source/WebCore/workers/DedicatedWorkerGlobalScope.idl @@ -30,7 +30,6 @@ [ GlobalContext=DedicatedWorkerGlobalScope, - Conditional=WORKERS, JSGenerateToNativeObject, JSNoStaticTables, ] interface DedicatedWorkerGlobalScope : WorkerGlobalScope { diff --git a/Source/WebCore/workers/DedicatedWorkerThread.cpp b/Source/WebCore/workers/DedicatedWorkerThread.cpp index fc8275a55488b31843b70d0f996acc01a31bc73a..1020ce99e6dc1b391e03c2d8149a323adff30125 100644 --- a/Source/WebCore/workers/DedicatedWorkerThread.cpp +++ b/Source/WebCore/workers/DedicatedWorkerThread.cpp @@ -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) diff --git a/Source/WebCore/workers/DedicatedWorkerThread.h b/Source/WebCore/workers/DedicatedWorkerThread.h index 9a914d4d5c187df62eaa746ba82ae6f086058ba4..512c70b2d47354ab4e229c7ea364db83afd206f8 100644 --- a/Source/WebCore/workers/DedicatedWorkerThread.h +++ b/Source/WebCore/workers/DedicatedWorkerThread.h @@ -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 diff --git a/Source/WebCore/workers/Worker.cpp b/Source/WebCore/workers/Worker.cpp index 401249ac05da85ca22cea07ee78b1034541cf5bb..5f095aebe445ff3f798807af04588a3bf7ca4549 100644 --- a/Source/WebCore/workers/Worker.cpp +++ b/Source/WebCore/workers/Worker.cpp @@ -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) diff --git a/Source/WebCore/workers/Worker.h b/Source/WebCore/workers/Worker.h index b6d263a3f146ed9633e61ba4bcb865807d57336b..ee5246cd92792b544b964e3ec19502ba34fd3ddf 100644 --- a/Source/WebCore/workers/Worker.h +++ b/Source/WebCore/workers/Worker.h @@ -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 diff --git a/Source/WebCore/workers/Worker.idl b/Source/WebCore/workers/Worker.idl index e569584d88d048ce9878b9959f625736a98d233b..3be80442abc25ac01140504805559613b81fb54e 100644 --- a/Source/WebCore/workers/Worker.idl +++ b/Source/WebCore/workers/Worker.idl @@ -26,7 +26,6 @@ */ [ - Conditional=WORKERS, CustomConstructor(DOMString scriptUrl), JSGenerateToNativeObject, JSGenerateToJSObject, diff --git a/Source/WebCore/workers/WorkerGlobalScope.cpp b/Source/WebCore/workers/WorkerGlobalScope.cpp index 293797405d5149a7d5d7702b66853a8f3c5e9d8a..ec2d190557ba0d1627da578b9d01f5613cc02281 100644 --- a/Source/WebCore/workers/WorkerGlobalScope.cpp +++ b/Source/WebCore/workers/WorkerGlobalScope.cpp @@ -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) diff --git a/Source/WebCore/workers/WorkerGlobalScope.h b/Source/WebCore/workers/WorkerGlobalScope.h index 2532b926dd33f613d117b23ce841ba1acc045fc4..59417b69fa80d517b10b3ce82d98e5a786028f21 100644 --- a/Source/WebCore/workers/WorkerGlobalScope.h +++ b/Source/WebCore/workers/WorkerGlobalScope.h @@ -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 diff --git a/Source/WebCore/workers/WorkerGlobalScope.idl b/Source/WebCore/workers/WorkerGlobalScope.idl index 5aa362f024f8c99c4c92bbe8a6c9b24d41133e44..1dc9054d214f1897097a123db4e334622123e116 100644 --- a/Source/WebCore/workers/WorkerGlobalScope.idl +++ b/Source/WebCore/workers/WorkerGlobalScope.idl @@ -26,7 +26,6 @@ [ GlobalContext=WorkerGlobalScope, - Conditional=WORKERS, JSCustomMarkFunction, JSCustomGetOwnPropertySlotAndDescriptor, EventTarget, diff --git a/Source/WebCore/workers/WorkerGlobalScopeProxy.h b/Source/WebCore/workers/WorkerGlobalScopeProxy.h index a95dc752a478825f157b0205a0447c2dc9ef897b..0a300710aaa48ffea1f68e1167e3f89277572b43 100644 --- a/Source/WebCore/workers/WorkerGlobalScopeProxy.h +++ b/Source/WebCore/workers/WorkerGlobalScopeProxy.h @@ -31,8 +31,6 @@ #ifndef WorkerGlobalScopeProxy_h #define WorkerGlobalScopeProxy_h -#if ENABLE(WORKERS) - #include "MessagePort.h" #include "WorkerThread.h" #include @@ -76,6 +74,4 @@ namespace WebCore { } // namespace WebCore -#endif // ENABLE(WORKERS) - #endif // WorkerGlobalScopeProxy_h diff --git a/Source/WebCore/workers/WorkerLoaderProxy.h b/Source/WebCore/workers/WorkerLoaderProxy.h index 18542b6fe755f20f64a65f529ec0488424e6a48a..62931248d71879d53f42e0a26a5c372b10e0999f 100644 --- a/Source/WebCore/workers/WorkerLoaderProxy.h +++ b/Source/WebCore/workers/WorkerLoaderProxy.h @@ -31,8 +31,6 @@ #ifndef WorkerLoaderProxy_h #define WorkerLoaderProxy_h -#if ENABLE(WORKERS) - #include "ScriptExecutionContext.h" #include #include @@ -59,6 +57,4 @@ namespace WebCore { } // namespace WebCore -#endif // ENABLE(WORKERS) - #endif // WorkerLoaderProxy_h diff --git a/Source/WebCore/workers/WorkerLocation.cpp b/Source/WebCore/workers/WorkerLocation.cpp index 2acdc86448b69f36511f308c543f084f8f02aaec..3a637c2c4c7710489ebacc27cf619596a250c0d0 100644 --- a/Source/WebCore/workers/WorkerLocation.cpp +++ b/Source/WebCore/workers/WorkerLocation.cpp @@ -26,8 +26,6 @@ #include "config.h" -#if ENABLE(WORKERS) - #include "WorkerLocation.h" #include @@ -76,5 +74,3 @@ String WorkerLocation::hash() const } // namespace WebCore - -#endif // ENABLE(WORKERS) diff --git a/Source/WebCore/workers/WorkerLocation.h b/Source/WebCore/workers/WorkerLocation.h index 1111b5d203b12e54e401e5ea85e328ebe1768855..d3d3b2884df45f030b5c3aefe8d831bfe955986c 100644 --- a/Source/WebCore/workers/WorkerLocation.h +++ b/Source/WebCore/workers/WorkerLocation.h @@ -27,8 +27,6 @@ #ifndef WorkerLocation_h #define WorkerLocation_h -#if ENABLE(WORKERS) - #include "URL.h" #include #include @@ -67,6 +65,4 @@ namespace WebCore { } // namespace WebCore -#endif // ENABLE(WORKERS) - #endif // WorkerLocation_h diff --git a/Source/WebCore/workers/WorkerLocation.idl b/Source/WebCore/workers/WorkerLocation.idl index 15096735a0cae3ca340c0ba9f3e4c3526a30b515..ff54aa7c1f43ebc0117a6959e2068768bef20e27 100644 --- a/Source/WebCore/workers/WorkerLocation.idl +++ b/Source/WebCore/workers/WorkerLocation.idl @@ -28,7 +28,6 @@ [ GlobalContext=WorkerGlobalScope, - Conditional=WORKERS, GenerateIsReachable=Impl, JSNoStaticTables, ImplementationLacksVTable, diff --git a/Source/WebCore/workers/WorkerMessagingProxy.cpp b/Source/WebCore/workers/WorkerMessagingProxy.cpp index 200c08e53fdd37261d82e233d1281636396a2e9a..0196f02fc9df48044fc549467b4a92a091c1bb8e 100644 --- a/Source/WebCore/workers/WorkerMessagingProxy.cpp +++ b/Source/WebCore/workers/WorkerMessagingProxy.cpp @@ -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) diff --git a/Source/WebCore/workers/WorkerMessagingProxy.h b/Source/WebCore/workers/WorkerMessagingProxy.h index b6b49f2950df9364fbe8df32f7f1bb49864f8b4e..0d7a6cdebe8accc073b66a8de8cfb90a6cdf7e6b 100644 --- a/Source/WebCore/workers/WorkerMessagingProxy.h +++ b/Source/WebCore/workers/WorkerMessagingProxy.h @@ -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 diff --git a/Source/WebCore/workers/WorkerObjectProxy.h b/Source/WebCore/workers/WorkerObjectProxy.h index ffb492dfa042d5c3067a24d7cd385fa9e90d42fd..7ae3fbb9f82d1564f18bd855f0518b13795e9591 100644 --- a/Source/WebCore/workers/WorkerObjectProxy.h +++ b/Source/WebCore/workers/WorkerObjectProxy.h @@ -31,8 +31,6 @@ #ifndef WorkerObjectProxy_h #define WorkerObjectProxy_h -#if ENABLE(WORKERS) - #include "WorkerReportingProxy.h" #include "MessagePort.h" #include @@ -55,6 +53,4 @@ namespace WebCore { } // namespace WebCore -#endif // ENABLE(WORKERS) - #endif // WorkerObjectProxy_h diff --git a/Source/WebCore/workers/WorkerReportingProxy.h b/Source/WebCore/workers/WorkerReportingProxy.h index 389e521cc767e3448b52b94c98499363e51155d8..61a6611e296256e27ad891c0c4e92a7356ab624f 100644 --- a/Source/WebCore/workers/WorkerReportingProxy.h +++ b/Source/WebCore/workers/WorkerReportingProxy.h @@ -31,8 +31,6 @@ #ifndef WorkerReportingProxy_h #define WorkerReportingProxy_h -#if ENABLE(WORKERS) - #include "ConsoleTypes.h" #include @@ -58,6 +56,4 @@ namespace WebCore { } // namespace WebCore -#endif // ENABLE(WORKERS) - #endif // WorkerReportingProxy_h diff --git a/Source/WebCore/workers/WorkerRunLoop.cpp b/Source/WebCore/workers/WorkerRunLoop.cpp index f4a2efc8637d62fe20667c3c1cd008f9682430bf..9a9f556f7413e3fe28d196d5d1ca452c05476065 100644 --- a/Source/WebCore/workers/WorkerRunLoop.cpp +++ b/Source/WebCore/workers/WorkerRunLoop.cpp @@ -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 task, const S } } // namespace WebCore - -#endif // ENABLE(WORKERS) diff --git a/Source/WebCore/workers/WorkerRunLoop.h b/Source/WebCore/workers/WorkerRunLoop.h index 3dee5a53f1da25f97c522c5b64ce9a6633c764ce..10aa81b54405a84a90bf71788984007dfc2082c8 100644 --- a/Source/WebCore/workers/WorkerRunLoop.h +++ b/Source/WebCore/workers/WorkerRunLoop.h @@ -31,8 +31,6 @@ #ifndef WorkerRunLoop_h #define WorkerRunLoop_h -#if ENABLE(WORKERS) - #include "ScriptExecutionContext.h" #include #include @@ -99,6 +97,4 @@ namespace WebCore { } // namespace WebCore -#endif // ENABLE(WORKERS) - #endif // WorkerRunLoop_h diff --git a/Source/WebCore/workers/WorkerScriptLoader.cpp b/Source/WebCore/workers/WorkerScriptLoader.cpp index 8da4eefed42c86524d6f735dc94426a8d99b163b..116dadfcaf5c4cbe7d5551b42b185f12caf2a870 100644 --- a/Source/WebCore/workers/WorkerScriptLoader.cpp +++ b/Source/WebCore/workers/WorkerScriptLoader.cpp @@ -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) diff --git a/Source/WebCore/workers/WorkerScriptLoader.h b/Source/WebCore/workers/WorkerScriptLoader.h index 9cb4fbdf48119537b0f05ed82ed8f138d78ccf2a..cc704a61927c6b61f48748a8584a180ae59417d1 100644 --- a/Source/WebCore/workers/WorkerScriptLoader.h +++ b/Source/WebCore/workers/WorkerScriptLoader.h @@ -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 diff --git a/Source/WebCore/workers/WorkerScriptLoaderClient.h b/Source/WebCore/workers/WorkerScriptLoaderClient.h index 371f9b75ca30baab008d6ed9dda4b5f5259c9f40..4112cf27a6620e00c449d4ba491dec5c5a4da60b 100644 --- a/Source/WebCore/workers/WorkerScriptLoaderClient.h +++ b/Source/WebCore/workers/WorkerScriptLoaderClient.h @@ -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 diff --git a/Source/WebCore/workers/WorkerThread.cpp b/Source/WebCore/workers/WorkerThread.cpp index 6733d1410832f5436bf47d081f97af1effd3f496..50bfa1dc5ebdc9a8a960e043b227a389b4f455e3 100644 --- a/Source/WebCore/workers/WorkerThread.cpp +++ b/Source/WebCore/workers/WorkerThread.cpp @@ -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) diff --git a/Source/WebCore/workers/WorkerThread.h b/Source/WebCore/workers/WorkerThread.h index b1fa22e496a2c30160ba942ceab6f06ca03fd026..96d9b07cd3846c91e126c86fc4df61bad2485bb0 100644 --- a/Source/WebCore/workers/WorkerThread.h +++ b/Source/WebCore/workers/WorkerThread.h @@ -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 diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index 33d58a9a33ffdb857c232454be9560d6a8977850..ab993d5392b8f05729e9b2dcac0179d052c6b6c3 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,3 +1,12 @@ +2013-11-21 Peter Molnar + + 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 [WinCairo] Building ANGLE libraries fails. diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in index 187001a827741dffdd39d763b67948ea59c81bd3..b5fd0041ed7143406c07605b53297fe06a239ea2 100644 --- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in +++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in @@ -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) diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog index dbf0c6fad6f062bcb286d20203e54125372dee1d..be288e12c9df1e4d72ed9c13414dbe5af2d76ba6 100644 --- a/Source/WebKit/efl/ChangeLog +++ b/Source/WebKit/efl/ChangeLog @@ -1,3 +1,13 @@ +2013-11-21 Peter Molnar + + 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 [EFL] Initialize efreet before getting directories diff --git a/Source/WebKit/efl/ewk/ewk_settings.cpp b/Source/WebKit/efl/ewk/ewk_settings.cpp index 3c3f675dfb0165142aee4ad94c54893ec60960c9..57f00abe4bef2751d4af6644de7424a4153e6a79 100644 --- a/Source/WebKit/efl/ewk/ewk_settings.cpp +++ b/Source/WebKit/efl/ewk/ewk_settings.cpp @@ -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(); } diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog index ff6349974a243280b75246b584b05bec6e808d62..a3eb7e5e840671afc2a96f75198a038fd1c67c96 100644 --- a/Source/WebKit/win/ChangeLog +++ b/Source/WebKit/win/ChangeLog @@ -1,3 +1,13 @@ +2013-11-21 Peter Molnar + + 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 Unreviewed, rolling out r159455. diff --git a/Source/WebKit/win/WebWorkersPrivate.cpp b/Source/WebKit/win/WebWorkersPrivate.cpp index f55c27c03f3d00d3fda0caf04afc9aeb7ee970ab..3326926e08830fd8702fc23f1724cc32e6dc809b 100644 --- a/Source/WebKit/win/WebWorkersPrivate.cpp +++ b/Source/WebKit/win/WebWorkersPrivate.cpp @@ -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; } diff --git a/Source/autotools/SetupWebKitFeatures.m4 b/Source/autotools/SetupWebKitFeatures.m4 index b7c28ffc7d27434b898fbe4dd1fcf59b9a90c6b6..376368eb3be5dbd043f8d7502425b288fe754432 100644 --- a/Source/autotools/SetupWebKitFeatures.m4 +++ b/Source/autotools/SetupWebKitFeatures.m4 @@ -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 diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake index 97b1b04bd9a26f2b2065372382f8af012afe7db5..bc492881f6a7e3ad28d099209aff5488aaef3830 100644 --- a/Source/cmake/WebKitFeatures.cmake +++ b/Source/cmake/WebKitFeatures.cmake @@ -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) diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake index 782cf92b91c3e990857b408fe1ee20d293f6401a..14fd676628bc2fe4f05b6696a34d84c4760b31f3 100644 --- a/Source/cmakeconfig.h.cmake +++ b/Source/cmakeconfig.h.cmake @@ -121,7 +121,6 @@ #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 diff --git a/Tools/ChangeLog b/Tools/ChangeLog index fb88866045aa95985ee261c7ca45a0ac70508849..59b0eda9139ece3bc694a7d077e7f5386b111a50 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,12 @@ +2013-11-21 Peter Molnar + + 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 Try to fix buildbot Dashboard for people who have not hidden anything. diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm index f8572c986370ff0d8bf80c1d9fa10bac70f49f04..6b7e8f57a27cda7d4afe2278fd3717b3ec32f2dc 100644 --- a/Tools/Scripts/webkitperl/FeatureList.pm +++ b/Tools/Scripts/webkitperl/FeatureList.pm @@ -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 }, diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 2dfed8a76a359c6367aa41a565565792efb990fc..2cdd8bb5c402acc6c90f6a2f9abad97d67417814 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,13 @@ +2013-11-21 Peter Molnar + + 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 Update binary drops to include atrick's "Ran out of registers" fix in r194942. diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props index dc01ef811e33c8fec20a18683afb935f885ee17d..b9e74c2136487497e1fd788ab638a7b91981fbef 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props @@ -83,7 +83,6 @@ ENABLE_WEB_SOCKETS - ENABLE_WORKERS ENABLE_XHR_TIMEOUT ENABLE_XSLT @@ -92,7 +91,7 @@ - $(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) + $(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) @@ -424,10 +423,6 @@ $(ENABLE_WEB_TIMING) true - - $(ENABLE_WORKERS) - true - $(ENABLE_XHR_TIMEOUT) true diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props index 9adcbe770d90cd6d6f2cd9271d5e8acb3d124a94..e3907697b3e3f0ff891cbef1d4da8e0667769cbe 100644 --- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props +++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props @@ -82,7 +82,6 @@ ENABLE_WEB_SOCKETS - ENABLE_WORKERS ENABLE_XHR_TIMEOUT ENABLE_XSLT @@ -91,7 +90,7 @@ - $(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) + $(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) @@ -419,10 +418,6 @@ $(ENABLE_WEB_TIMING) true - - $(ENABLE_WORKERS) - true - $(ENABLE_XHR_TIMEOUT) true