Remove ENABLE_WORKERS

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

.:

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

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

Source/WebCore:

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

Source/WebKit:

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

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

Source/WebKit/efl:

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

* ewk/ewk_settings.cpp:
(ewk_settings_memory_cache_clear):

Source/WebKit/win:

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

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

Source/WTF:

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

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

Tools:

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

* Scripts/webkitperl/FeatureList.pm:

WebKitLibraries:

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

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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159679 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent eca09750
2013-11-21 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
Remove ENABLE_WORKERS
https://bugs.webkit.org/show_bug.cgi?id=105784
Reviewed by Darin Adler.
* Source/autotools/SetupWebKitFeatures.m4:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
2013-11-20 Commit Queue <commit-queue@webkit.org> 2013-11-20 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r159496. Unreviewed, rolling out r159496.
......
2013-11-21 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
Remove ENABLE_WORKERS
https://bugs.webkit.org/show_bug.cgi?id=105784
Reviewed by Darin Adler.
* wtf/FeatureDefines.h:
* wtf/nix/FeatureDefinesNix.h:
2013-11-21 Mark Rowe <mrowe@apple.com> 2013-11-21 Mark Rowe <mrowe@apple.com>
<https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files. <https://webkit.org/b/124701> Fix an error in a few Xcode configuration setting files.
......
...@@ -863,10 +863,6 @@ ...@@ -863,10 +863,6 @@
#define ENABLE_WEB_TIMING 0 #define ENABLE_WEB_TIMING 0
#endif #endif
#if !defined(ENABLE_WORKERS)
#define ENABLE_WORKERS 0
#endif
#if !defined(ENABLE_XHR_TIMEOUT) #if !defined(ENABLE_XHR_TIMEOUT)
#define ENABLE_XHR_TIMEOUT 0 #define ENABLE_XHR_TIMEOUT 0
#endif #endif
......
...@@ -278,10 +278,6 @@ ...@@ -278,10 +278,6 @@
#define ENABLE_WEB_TIMING 1 #define ENABLE_WEB_TIMING 1
#endif #endif
#if !defined(ENABLE_WORKERS)
#define ENABLE_WORKERS 1
#endif
#if !defined(ENABLE_XHR_RESPONSE_BLOB) #if !defined(ENABLE_XHR_RESPONSE_BLOB)
#define ENABLE_XHR_RESPONSE_BLOB 1 #define ENABLE_XHR_RESPONSE_BLOB 1
#endif #endif
......
...@@ -2605,7 +2605,7 @@ set(WebCore_LIBRARIES ...@@ -2605,7 +2605,7 @@ set(WebCore_LIBRARIES
WTF WTF
) )
if (ENABLE_SQL_DATABASE AND ENABLE_WORKERS) if (ENABLE_SQL_DATABASE)
list(APPEND WebCore_SOURCES list(APPEND WebCore_SOURCES
Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp
) )
......
2013-11-21 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
Remove ENABLE_WORKERS
https://bugs.webkit.org/show_bug.cgi?id=105784
Reviewed by Darin Adler.
2013-11-21 Alex Christensen <achristensen@webkit.org> 2013-11-21 Alex Christensen <achristensen@webkit.org>
[Win] Unreviewed build fix after r159632. [Win] Unreviewed build fix after r159632.
...@@ -74,10 +74,6 @@ static bool isContextValid(ScriptExecutionContext* context) ...@@ -74,10 +74,6 @@ static bool isContextValid(ScriptExecutionContext* context)
Document* document = toDocument(context); Document* document = toDocument(context);
return document->frame() && document->page(); return document->frame() && document->page();
} }
#if !ENABLE(WORKERS)
if (context->isWorkerGlobalScope())
return false;
#endif
return true; return true;
} }
...@@ -88,12 +84,10 @@ static String getIndexedDBDatabasePath(ScriptExecutionContext* context) ...@@ -88,12 +84,10 @@ static String getIndexedDBDatabasePath(ScriptExecutionContext* context)
Document* document = toDocument(context); Document* document = toDocument(context);
return document->page()->group().groupSettings().indexedDBDatabasePath(); return document->page()->group().groupSettings().indexedDBDatabasePath();
} }
#if ENABLE(WORKERS)
WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context); WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context);
const GroupSettings* groupSettings = workerGlobalScope->groupSettings(); const GroupSettings* groupSettings = workerGlobalScope->groupSettings();
if (groupSettings) if (groupSettings)
return groupSettings->indexedDBDatabasePath(); return groupSettings->indexedDBDatabasePath();
#endif
return String(); return String();
} }
} }
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "config.h" #include "config.h"
#if ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE) #if ENABLE(INDEXED_DATABASE)
#include "WorkerGlobalScopeIndexedDatabase.h" #include "WorkerGlobalScopeIndexedDatabase.h"
...@@ -84,4 +84,4 @@ IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB() ...@@ -84,4 +84,4 @@ IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB()
} // namespace WebCore } // namespace WebCore
#endif // ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE) #endif // ENABLE(INDEXED_DATABASE)
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#ifndef WorkerGlobalScopeIndexedDatabase_h #ifndef WorkerGlobalScopeIndexedDatabase_h
#define WorkerGlobalScopeIndexedDatabase_h #define WorkerGlobalScopeIndexedDatabase_h
#if ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE) #if ENABLE(INDEXED_DATABASE)
#include "Supplementable.h" #include "Supplementable.h"
#include <wtf/text/WTFString.h> #include <wtf/text/WTFString.h>
...@@ -58,6 +58,6 @@ private: ...@@ -58,6 +58,6 @@ private:
} // namespace WebCore } // namespace WebCore
#endif // ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE) #endif // ENABLE(INDEXED_DATABASE)
#endif // WorkerGlobalScopeIndexedDatabase_h #endif // WorkerGlobalScopeIndexedDatabase_h
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "config.h" #include "config.h"
#if ENABLE(SQL_DATABASE) && ENABLE(WORKERS) #if ENABLE(SQL_DATABASE)
#include "WorkerGlobalScopeWebDatabase.h" #include "WorkerGlobalScopeWebDatabase.h"
...@@ -73,4 +73,4 @@ PassRefPtr<DatabaseSync> WorkerGlobalScopeWebDatabase::openDatabaseSync(WorkerGl ...@@ -73,4 +73,4 @@ PassRefPtr<DatabaseSync> WorkerGlobalScopeWebDatabase::openDatabaseSync(WorkerGl
} // namespace WebCore } // namespace WebCore
#endif // ENABLE(SQL_DATABASE) && ENABLE(WORKERS) #endif // ENABLE(SQL_DATABASE)
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#ifndef WorkerGlobalScopeWebDatabase_h #ifndef WorkerGlobalScopeWebDatabase_h
#define WorkerGlobalScopeWebDatabase_h #define WorkerGlobalScopeWebDatabase_h
#if ENABLE(SQL_DATABASE) && ENABLE(WORKERS) #if ENABLE(SQL_DATABASE)
#include "ExceptionCode.h" #include "ExceptionCode.h"
#include <wtf/Forward.h> #include <wtf/Forward.h>
...@@ -54,6 +54,6 @@ private: ...@@ -54,6 +54,6 @@ private:
} // namespace WebCore } // namespace WebCore
#endif // ENABLE(SQL_DATABASE) && ENABLE(WORKERS) #endif // ENABLE(SQL_DATABASE)
#endif // WorkerGlobalScopeWebDatabase_h #endif // WorkerGlobalScopeWebDatabase_h
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
*/ */
[ [
Conditional=SQL_DATABASE&WORKERS, Conditional=SQL_DATABASE,
] partial interface WorkerGlobalScope { ] partial interface WorkerGlobalScope {
[RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback); [RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
......
...@@ -55,7 +55,6 @@ PassRefPtr<ThreadableWebSocketChannel> ThreadableWebSocketChannel::create(Script ...@@ -55,7 +55,6 @@ PassRefPtr<ThreadableWebSocketChannel> ThreadableWebSocketChannel::create(Script
ASSERT(context); ASSERT(context);
ASSERT(client); ASSERT(client);
#if ENABLE(WORKERS)
if (context->isWorkerGlobalScope()) { if (context->isWorkerGlobalScope()) {
WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context); WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context);
WorkerRunLoop& runLoop = workerGlobalScope->thread()->runLoop(); WorkerRunLoop& runLoop = workerGlobalScope->thread()->runLoop();
...@@ -63,7 +62,6 @@ PassRefPtr<ThreadableWebSocketChannel> ThreadableWebSocketChannel::create(Script ...@@ -63,7 +62,6 @@ PassRefPtr<ThreadableWebSocketChannel> ThreadableWebSocketChannel::create(Script
mode.append(String::number(runLoop.createUniqueId())); mode.append(String::number(runLoop.createUniqueId()));
return WorkerThreadableWebSocketChannel::create(workerGlobalScope, client, mode); return WorkerThreadableWebSocketChannel::create(workerGlobalScope, client, mode);
} }
#endif // ENABLE(WORKERS)
return WebSocketChannel::create(toDocument(context), client); return WebSocketChannel::create(toDocument(context), client);
} }
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
#include "config.h" #include "config.h"
#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS) #if ENABLE(WEB_SOCKETS)
#include "ThreadableWebSocketChannelClientWrapper.h" #include "ThreadableWebSocketChannelClientWrapper.h"
#include "CrossThreadCopier.h" #include "CrossThreadCopier.h"
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#ifndef ThreadableWebSocketChannelClientWrapper_h #ifndef ThreadableWebSocketChannelClientWrapper_h
#define ThreadableWebSocketChannelClientWrapper_h #define ThreadableWebSocketChannelClientWrapper_h
#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS) #if ENABLE(WEB_SOCKETS)
#include "ScriptExecutionContext.h" #include "ScriptExecutionContext.h"
#include "ThreadableWebSocketChannel.h" #include "ThreadableWebSocketChannel.h"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "config.h" #include "config.h"
#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS) #if ENABLE(WEB_SOCKETS)
#include "WorkerThreadableWebSocketChannel.h" #include "WorkerThreadableWebSocketChannel.h"
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#ifndef WorkerThreadableWebSocketChannel_h #ifndef WorkerThreadableWebSocketChannel_h
#define WorkerThreadableWebSocketChannel_h #define WorkerThreadableWebSocketChannel_h
#if ENABLE(WEB_SOCKETS) && ENABLE(WORKERS) #if ENABLE(WEB_SOCKETS)
#include "ThreadableWebSocketChannel.h" #include "ThreadableWebSocketChannel.h"
#include "WebSocketChannelClient.h" #include "WebSocketChannelClient.h"
......
...@@ -184,7 +184,6 @@ if (ENABLE_INDEXED_DATABASE) ...@@ -184,7 +184,6 @@ if (ENABLE_INDEXED_DATABASE)
) )
endif () endif ()
if (ENABLE_WORKERS)
list(APPEND WebCore_SOURCES list(APPEND WebCore_SOURCES
bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
bindings/js/JSWorkerGlobalScopeBase.cpp bindings/js/JSWorkerGlobalScopeBase.cpp
...@@ -193,7 +192,6 @@ if (ENABLE_WORKERS) ...@@ -193,7 +192,6 @@ if (ENABLE_WORKERS)
bindings/js/WorkerScriptController.cpp bindings/js/WorkerScriptController.cpp
bindings/js/WorkerScriptDebugServer.cpp bindings/js/WorkerScriptDebugServer.cpp
) )
endif ()
if (ENABLE_VIDEO_TRACK) if (ENABLE_VIDEO_TRACK)
list(APPEND WebCore_SOURCES list(APPEND WebCore_SOURCES
......
...@@ -241,6 +241,7 @@ __ZN7WebCore12TextIterator8subrangeEPNS_5RangeEii ...@@ -241,6 +241,7 @@ __ZN7WebCore12TextIterator8subrangeEPNS_5RangeEii
__ZN7WebCore12TextIteratorC1EPKNS_5RangeENS_20TextIteratorBehaviorE __ZN7WebCore12TextIteratorC1EPKNS_5RangeENS_20TextIteratorBehaviorE
__ZN7WebCore12TextIteratorD1Ev __ZN7WebCore12TextIteratorD1Ev
__ZN7WebCore12UTF8EncodingEv __ZN7WebCore12UTF8EncodingEv
__ZN7WebCore12WorkerThread17workerThreadCountEv
__ZN7WebCore12cacheStorageEv __ZN7WebCore12cacheStorageEv
__ZN7WebCore12deleteCookieERKNS_21NetworkStorageSessionERKNS_3URLERKN3WTF6StringE __ZN7WebCore12deleteCookieERKNS_21NetworkStorageSessionERKNS_3URLERKN3WTF6StringE
__ZN7WebCore12gcControllerEv __ZN7WebCore12gcControllerEv
...@@ -2881,10 +2882,6 @@ __ZNK7WebCore16HTMLMediaElement6pausedEv ...@@ -2881,10 +2882,6 @@ __ZNK7WebCore16HTMLMediaElement6pausedEv
__ZN7WebCore4Page11setViewModeENS0_8ViewModeE __ZN7WebCore4Page11setViewModeENS0_8ViewModeE
#endif #endif
#if ENABLE(WORKERS)
__ZN7WebCore12WorkerThread17workerThreadCountEv
#endif
#if ENABLE(VIDEO_TRACK) #if ENABLE(VIDEO_TRACK)
__ZN7WebCore9PageGroup18captionPreferencesEv __ZN7WebCore9PageGroup18captionPreferencesEv
#endif #endif
......
...@@ -33,9 +33,11 @@ ...@@ -33,9 +33,11 @@
#include "ThreadCheck.h" #include "ThreadCheck.h"
#include "WebDOMDOMApplicationCache.h" #include "WebDOMDOMApplicationCache.h"
#include "WebDOMDOMWindow.h" #include "WebDOMDOMWindow.h"
#include "WebDOMDedicatedWorkerGlobalScope.h"
#include "WebDOMEventSource.h" #include "WebDOMEventSource.h"
#include "WebDOMMessagePort.h" #include "WebDOMMessagePort.h"
#include "WebDOMNode.h" #include "WebDOMNode.h"
#include "WebDOMWorker.h"
#include "WebDOMXMLHttpRequest.h" #include "WebDOMXMLHttpRequest.h"
#include "WebDOMXMLHttpRequestUpload.h" #include "WebDOMXMLHttpRequestUpload.h"
#include "WebExceptionHandler.h" #include "WebExceptionHandler.h"
...@@ -46,11 +48,6 @@ ...@@ -46,11 +48,6 @@
#include <wtf/RefPtr.h> #include <wtf/RefPtr.h>
#if ENABLE(WORKERS)
#include "WebDOMDedicatedWorkerGlobalScope.h"
#include "WebDOMWorker.h"
#endif
#if ENABLE(SHARED_WORKERS) #if ENABLE(SHARED_WORKERS)
#include "WebDOMSharedWorker.h" #include "WebDOMSharedWorker.h"
#include "WebDOMSharedWorkerGlobalScope.h" #include "WebDOMSharedWorkerGlobalScope.h"
...@@ -112,11 +109,6 @@ WebDOM##type WebDOMEventTarget::to##type() \ ...@@ -112,11 +109,6 @@ WebDOM##type WebDOMEventTarget::to##type() \
ConvertTo(Node) ConvertTo(Node)
ConvertTo(DOMWindow) ConvertTo(DOMWindow)
#if ENABLE(WORKERS) && 0
ConvertTo(Worker)
ConvertTo(DedicatedWorkerGlobalScope)
#endif
#if ENABLE(SHARED_WORKERS) #if ENABLE(SHARED_WORKERS)
ConvertTo(SharedWorker) ConvertTo(SharedWorker)
ConvertTo(SharedWorkerGlobalScope) ConvertTo(SharedWorkerGlobalScope)
...@@ -150,14 +142,6 @@ WebDOMEventTarget toWebKit(WebCore::EventTarget* value) ...@@ -150,14 +142,6 @@ WebDOMEventTarget toWebKit(WebCore::EventTarget* value)
return toWebKit(instance); return toWebKit(instance);
#endif #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 ENABLE(SHARED_WORKERS)
if (WebCore::SharedWorker* sharedWorker = value->toSharedWorker()) if (WebCore::SharedWorker* sharedWorker = value->toSharedWorker())
return toWebKit(sharedWorker); return toWebKit(sharedWorker);
......
...@@ -33,10 +33,7 @@ ...@@ -33,10 +33,7 @@
#include "ActiveDOMObject.h" #include "ActiveDOMObject.h"
#include "ScriptExecutionContext.h" #include "ScriptExecutionContext.h"
#if ENABLE(WORKERS)
#include "WorkerGlobalScope.h" #include "WorkerGlobalScope.h"
#endif
namespace WebCore { namespace WebCore {
......
...@@ -31,9 +31,7 @@ ...@@ -31,9 +31,7 @@
#include "DOMWrapperWorld.h" #include "DOMWrapperWorld.h"
#include "Document.h" #include "Document.h"
#include "ScriptState.h" #include "ScriptState.h"
#if ENABLE(WORKERS)
#include "WorkerGlobalScope.h" #include "WorkerGlobalScope.h"
#endif
#include <JavaScriptCore/APIShims.h> #include <JavaScriptCore/APIShims.h>
...@@ -51,10 +49,8 @@ public: ...@@ -51,10 +49,8 @@ public:
Document* document = toDocument(m_scriptExecutionContext); Document* document = toDocument(m_scriptExecutionContext);
m_exec = execStateFromPage(mainThreadNormalWorld(), document->page()); m_exec = execStateFromPage(mainThreadNormalWorld(), document->page());
} else { } else {
#if ENABLE(WORKERS)
WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(m_scriptExecutionContext); WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(m_scriptExecutionContext);
m_exec = execStateFromWorkerGlobalScope(workerGlobalScope); m_exec = execStateFromWorkerGlobalScope(workerGlobalScope);
#endif
} }
} }
......
...@@ -30,11 +30,8 @@ ...@@ -30,11 +30,8 @@
#include "Document.h" #include "Document.h"
#include "JSDOMWindow.h" #include "JSDOMWindow.h"
#include "JSEventListener.h" #include "JSEventListener.h"
#if ENABLE(WORKERS)
#include "JSWorkerGlobalScope.h" #include "JSWorkerGlobalScope.h"
#include "WorkerGlobalScope.h" #include "WorkerGlobalScope.h"
#endif
using namespace JSC; using namespace JSC;
...@@ -71,10 +68,8 @@ ScriptExecutionContext* JSDOMGlobalObject::scriptExecutionContext() const ...@@ -71,10 +68,8 @@ ScriptExecutionContext* JSDOMGlobalObject::scriptExecutionContext() const
{ {
if (inherits(JSDOMWindowBase::info())) if (inherits(JSDOMWindowBase::info()))
return jsCast<const JSDOMWindowBase*>(this)->scriptExecutionContext(); return jsCast<const JSDOMWindowBase*>(this)->scriptExecutionContext();
#if ENABLE(WORKERS)
if (inherits(JSWorkerGlobalScopeBase::info())) if (inherits(JSWorkerGlobalScopeBase::info()))
return jsCast<const JSWorkerGlobalScopeBase*>(this)->scriptExecutionContext(); return jsCast<const JSWorkerGlobalScopeBase*>(this)->scriptExecutionContext();
#endif
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
return 0; return 0;
} }
...@@ -116,10 +111,8 @@ JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext* scriptExecutionCo ...@@ -116,10 +111,8 @@ JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext* scriptExecutionCo
if (scriptExecutionContext->isDocument()) if (scriptExecutionContext->isDocument())
return toJSDOMGlobalObject(toDocument(scriptExecutionContext), exec); return toJSDOMGlobalObject(toDocument(scriptExecutionContext), exec);
#if ENABLE(WORKERS)
if (scriptExecutionContext->isWorkerGlobalScope()) if (scriptExecutionContext->isWorkerGlobalScope())
return static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->workerGlobalScopeWrapper(); return static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->workerGlobalScopeWrapper();
#endif
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
return 0; return 0;
...@@ -135,10 +128,8 @@ JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext* scriptExecutionCo ...@@ -135,10 +128,8 @@ JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext* scriptExecutionCo
if (scriptExecutionContext->isDocument()) if (scriptExecutionContext->isDocument())
return toJSDOMGlobalObject(toDocument(scriptExecutionContext), world); return toJSDOMGlobalObject(toDocument(scriptExecutionContext), world);
#if ENABLE(WORKERS)
if (scriptExecutionContext->isWorkerGlobalScope()) if (scriptExecutionContext->isWorkerGlobalScope())
return static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->workerGlobalScopeWrapper(); return static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->workerGlobalScopeWrapper();
#endif
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
return 0; return 0;
......
...@@ -31,15 +31,12 @@ ...@@ -31,15 +31,12 @@
#include "JSHTMLOptionElement.h" #include "JSHTMLOptionElement.h"
#include "JSImageConstructor.h" #include "JSImageConstructor.h"
#include "JSMessagePortCustom.h" #include "JSMessagePortCustom.h"
#include "JSWorker.h"
#include "Location.h" #include "Location.h"
#include "ScheduledAction.h" #include "ScheduledAction.h"
#include "Settings.h" #include "Settings.h"
#include "SharedWorkerRepository.h" #include "SharedWorkerRepository.h"
#if ENABLE(WORKERS)