Rename WorkerContext to WorkerGlobalScope
authorch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jun 2013 06:21:54 +0000 (06:21 +0000)
committerch.dumez@sisa.samsung.com <ch.dumez@sisa.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jun 2013 06:21:54 +0000 (06:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=118059

Reviewed by Kentaro Hara.

Source/WebCore:

Rename WorkerContext / SharedWorkerContext / DedicatedWorkerContext to
WorkerGlobalScope / SharedWorkerGlobalScope / DedicatedWorkerGlobalScope
to match the latest specification:
http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#workerglobalscope

Those interfaces have [NoInterfaceObject] IDL extended attribute so the
name did not matter much so far. However, the specification was updated
and [NoInterfaceObject] was removed. We should therefore rename those
interfaces as a preparation for this change.

No new tests, no behavior change as these interfaces are not exposed to
JavaScript yet.

* CMakeLists.txt:
* DerivedSources.cpp:
* DerivedSources.make:
* DerivedSources.pri:
* GNUmakefile.am:
* GNUmakefile.list.am:
* Modules/filesystem/WorkerGlobalScopeFileSystem.cpp: Renamed from Source/WebCore/Modules/filesystem/WorkerContextFileSystem.cpp.
(WebCore::WorkerGlobalScopeFileSystem::webkitRequestFileSystem):
(WebCore::WorkerGlobalScopeFileSystem::webkitRequestFileSystemSync):
(WebCore::WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemURL):
(WebCore::WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemSyncURL):
* Modules/filesystem/WorkerGlobalScopeFileSystem.h: Renamed from Source/WebCore/Modules/filesystem/WorkerContextFileSystem.h.
* Modules/filesystem/WorkerGlobalScopeFileSystem.idl: Renamed from Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl.
* Modules/indexeddb/IDBFactory.cpp:
* Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp: Renamed from Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.cpp.
(WebCore::WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase):
(WebCore::WorkerGlobalScopeIndexedDatabase::~WorkerGlobalScopeIndexedDatabase):
(WebCore::WorkerGlobalScopeIndexedDatabase::supplementName):
(WebCore::WorkerGlobalScopeIndexedDatabase::from):
(WebCore::WorkerGlobalScopeIndexedDatabase::indexedDB):
* Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h: Renamed from Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.h.
* Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl: Renamed from Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl.
* Modules/notifications/Notification.cpp:
* Modules/notifications/NotificationCenter.cpp:
* Modules/notifications/WorkerGlobalScopeNotifications.cpp: Renamed from Source/WebCore/Modules/notifications/WorkerContextNotifications.cpp.
(WebCore::WorkerGlobalScopeNotifications::WorkerGlobalScopeNotifications):
(WebCore::WorkerGlobalScopeNotifications::~WorkerGlobalScopeNotifications):
(WebCore::WorkerGlobalScopeNotifications::supplementName):
(WebCore::WorkerGlobalScopeNotifications::from):
(WebCore::WorkerGlobalScopeNotifications::webkitNotifications):
* Modules/notifications/WorkerGlobalScopeNotifications.h: Renamed from Source/WebCore/Modules/notifications/WorkerContextNotifications.h.
* Modules/notifications/WorkerGlobalScopeNotifications.idl: Renamed from Source/WebCore/Modules/notifications/WorkerContextNotifications.idl.
* Modules/webdatabase/DatabaseContext.cpp:
(WebCore::DatabaseContext::allowDatabaseAccess):
(WebCore::DatabaseContext::databaseExceededQuota):
* Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp: Renamed from Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.cpp.
(WebCore::WorkerGlobalScopeWebDatabase::openDatabase):
(WebCore::WorkerGlobalScopeWebDatabase::openDatabaseSync):
* Modules/webdatabase/WorkerGlobalScopeWebDatabase.h: Renamed from Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.h.
(WebCore::WorkerGlobalScopeWebDatabase::WorkerGlobalScopeWebDatabase):
(WebCore::WorkerGlobalScopeWebDatabase::~WorkerGlobalScopeWebDatabase):
* Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl: Renamed from Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.idl.
* Modules/websockets/ThreadableWebSocketChannel.cpp:
(WebCore::ThreadableWebSocketChannel::create):
* Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
(WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback):
* Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
(WebCore::WorkerThreadableWebSocketChannel::WorkerThreadableWebSocketChannel):
(WebCore::workerGlobalScopeDidSend):
(WebCore::WorkerThreadableWebSocketChannel::Peer::send):
(WebCore::workerGlobalScopeDidGetBufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Peer::bufferedAmount):
(WebCore::workerGlobalScopeDidConnect):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didConnect):
(WebCore::workerGlobalScopeDidReceiveMessage):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessage):
(WebCore::workerGlobalScopeDidReceiveBinaryData):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
(WebCore::workerGlobalScopeDidUpdateBufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount):
(WebCore::workerGlobalScopeDidStartClosingHandshake):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake):
(WebCore::workerGlobalScopeDidClose):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didClose):
(WebCore::workerGlobalScopeDidReceiveMessageError):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::Bridge):
(WebCore::WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask::create):
(WebCore::WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask::~WorkerGlobalScopeDidInitializeTask):
(WebCore::WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask::WorkerGlobalScopeDidInitializeTask):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::disconnect):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::waitForMethodCompletion):
* Modules/websockets/WorkerThreadableWebSocketChannel.h:
(WebCore::WorkerThreadableWebSocketChannel::create):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::create):
* Target.pri:
* UseJSC.cmake:
* WebCore.order:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/cpp/WebDOMEventTarget.cpp:
(toWebKit):
* bindings/cpp/WebDOMEventTarget.h:
* bindings/generic/ActiveDOMCallback.cpp:
* bindings/js/DOMRequestState.h:
(WebCore::DOMRequestState::DOMRequestState):
* bindings/js/JSBindingsAllInOne.cpp:
* bindings/js/JSDOMBinding.h:
* bindings/js/JSDOMGlobalObject.cpp:
(WebCore::JSDOMGlobalObject::scriptExecutionContext):
(WebCore::toJSDOMGlobalObject):
* bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp: Renamed from Source/WebCore/bindings/js/JSDedicatedWorkerContextCustom.cpp.
(WebCore::JSDedicatedWorkerGlobalScope::postMessage):
* bindings/js/JSEventListener.cpp:
(WebCore::JSEventListener::handleEvent):
* bindings/js/JSEventTargetCustom.cpp:
(WebCore::toJS):
* bindings/js/JSWorkerGlobalScopeBase.cpp: Renamed from Source/WebCore/bindings/js/JSWorkerContextBase.cpp.
(WebCore::JSWorkerGlobalScopeBase::JSWorkerGlobalScopeBase):
(WebCore::JSWorkerGlobalScopeBase::finishCreation):
(WebCore::JSWorkerGlobalScopeBase::destroy):
(WebCore::JSWorkerGlobalScopeBase::scriptExecutionContext):
(WebCore::toJS):
(WebCore::toJSDedicatedWorkerGlobalScope):
(WebCore::toJSSharedWorkerGlobalScope):
(WebCore::toJSWorkerGlobalScope):
* bindings/js/JSWorkerGlobalScopeBase.h: Renamed from Source/WebCore/bindings/js/JSWorkerContextBase.h.
(WebCore::JSWorkerGlobalScopeBase::impl):
(WebCore::JSWorkerGlobalScopeBase::createStructure):
* bindings/js/JSWorkerGlobalScopeCustom.cpp: Renamed from Source/WebCore/bindings/js/JSWorkerContextCustom.cpp.
(WebCore::JSWorkerGlobalScope::visitChildren):
(WebCore::JSWorkerGlobalScope::getOwnPropertySlotDelegate):
(WebCore::JSWorkerGlobalScope::getOwnPropertyDescriptorDelegate):
(WebCore::JSWorkerGlobalScope::importScripts):
(WebCore::JSWorkerGlobalScope::setTimeout):
(WebCore::JSWorkerGlobalScope::setInterval):
* bindings/js/ScheduledAction.cpp:
(WebCore::ScheduledAction::execute):
* bindings/js/ScheduledAction.h:
* bindings/js/ScriptProfiler.cpp:
(WebCore::ScriptProfiler::startForWorkerGlobalScope):
(WebCore::ScriptProfiler::stopForWorkerGlobalScope):
* bindings/js/ScriptProfiler.h:
* bindings/js/ScriptState.cpp:
(WebCore::scriptStateFromWorkerGlobalScope):
* bindings/js/ScriptState.h:
* bindings/js/WorkerScriptController.cpp:
(WebCore::WorkerScriptController::WorkerScriptController):
(WebCore::WorkerScriptController::~WorkerScriptController):
(WebCore::WorkerScriptController::initScript):
(WebCore::WorkerScriptController::evaluate):
(WebCore::WorkerScriptController::setException):
(WebCore::WorkerScriptController::forbidExecution):
(WebCore::WorkerScriptController::isExecutionForbidden):
(WebCore::WorkerScriptController::disableEval):
(WebCore::WorkerScriptController::attachDebugger):
(WebCore::WorkerScriptController::detachDebugger):
* bindings/js/WorkerScriptController.h:
(WebCore::WorkerScriptController::workerGlobalScopeWrapper):
(WebCore::WorkerScriptController::initScriptIfNeeded):
* bindings/js/WorkerScriptDebugServer.cpp:
(WebCore::WorkerScriptDebugServer::WorkerScriptDebugServer):
(WebCore::WorkerScriptDebugServer::addListener):
(WebCore::WorkerScriptDebugServer::recompileAllJSFunctions):
(WebCore::WorkerScriptDebugServer::removeListener):
(WebCore::WorkerScriptDebugServer::runEventLoopWhilePaused):
* bindings/js/WorkerScriptDebugServer.h:
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
(GenerateImplementation):
* bindings/scripts/IDLAttributes.txt:
* bindings/scripts/preprocess-idls.pl:
* dom/ActiveDOMObject.cpp:
* dom/EventTarget.h:
* dom/EventTargetFactory.in:
* dom/MessagePort.cpp:
(WebCore::MessagePort::dispatchMessages):
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::createdMessagePort):
(WebCore::ScriptExecutionContext::destroyedMessagePort):
(WebCore::ScriptExecutionContext::vm):
* dom/ScriptExecutionContext.h:
(WebCore::ScriptExecutionContext::isWorkerGlobalScope):
* inspector/InjectedScriptManager.cpp:
(WebCore::InjectedScriptManager::createForWorker):
(WebCore::InjectedScriptManager::canAccessInspectedWorkerGlobalScope):
* inspector/InjectedScriptManager.h:
* inspector/InspectorConsoleInstrumentation.h:
(WebCore::InspectorInstrumentation::addMessageToConsole):
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didStartWorkerGlobalScopeImpl):
(WebCore::InspectorInstrumentation::willEvaluateWorkerScript):
(WebCore::InspectorInstrumentation::workerGlobalScopeTerminatedImpl):
(WebCore::InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope):
(WebCore::InspectorInstrumentation::instrumentingAgentsForNonDocumentContext):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::didStartWorkerGlobalScope):
(WebCore::InspectorInstrumentation::workerGlobalScopeTerminated):
* inspector/InspectorProfilerAgent.cpp:
(WebCore::WorkerProfilerAgent::WorkerProfilerAgent):
(WebCore::WorkerProfilerAgent::startProfiling):
(WebCore::WorkerProfilerAgent::stopProfiling):
(WebCore::InspectorProfilerAgent::create):
* inspector/InspectorProfilerAgent.h:
* inspector/InspectorRuntimeAgent.h:
* inspector/InspectorWorkerAgent.cpp:
(WebCore::InspectorWorkerAgent::WorkerFrontendChannel::WorkerFrontendChannel):
(WebCore::InspectorWorkerAgent::WorkerFrontendChannel::~WorkerFrontendChannel):
(WebCore::InspectorWorkerAgent::WorkerFrontendChannel::proxy):
(WebCore::InspectorWorkerAgent::WorkerFrontendChannel::connectToWorkerGlobalScope):
(WebCore::InspectorWorkerAgent::WorkerFrontendChannel::disconnectFromWorkerGlobalScope):
(WebCore::InspectorWorkerAgent::connectToWorker):
(WebCore::InspectorWorkerAgent::disconnectFromWorker):
(WebCore::InspectorWorkerAgent::didStartWorkerGlobalScope):
(WebCore::InspectorWorkerAgent::workerGlobalScopeTerminated):
(WebCore::InspectorWorkerAgent::destroyWorkerFrontendChannels):
(WebCore::InspectorWorkerAgent::createWorkerFrontendChannel):
* inspector/InspectorWorkerAgent.h:
* inspector/InstrumentingAgents.cpp:
(WebCore::instrumentationForWorkerGlobalScope):
* inspector/InstrumentingAgents.h:
* inspector/WorkerDebuggerAgent.cpp:
(WebCore::WorkerDebuggerAgent::create):
(WebCore::WorkerDebuggerAgent::WorkerDebuggerAgent):
(WebCore::WorkerDebuggerAgent::~WorkerDebuggerAgent):
(WebCore::WorkerDebuggerAgent::interruptAndDispatchInspectorCommands):
(WebCore::WorkerDebuggerAgent::injectedScriptForEval):
* inspector/WorkerDebuggerAgent.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
(WebCore::WorkerInspectorController::connectFrontend):
* inspector/WorkerInspectorController.h:
* inspector/WorkerRuntimeAgent.cpp:
(WebCore::WorkerRuntimeAgent::WorkerRuntimeAgent):
(WebCore::WorkerRuntimeAgent::injectedScriptForEval):
(WebCore::WorkerRuntimeAgent::pauseWorkerGlobalScope):
* inspector/WorkerRuntimeAgent.h:
(WebCore::WorkerRuntimeAgent::create):
* loader/ThreadableLoader.cpp:
(WebCore::ThreadableLoader::create):
(WebCore::ThreadableLoader::loadResourceSynchronously):
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::WorkerThreadableLoader):
(WebCore::WorkerThreadableLoader::loadResourceSynchronously):
(WebCore::workerGlobalScopeDidSendData):
(WebCore::WorkerThreadableLoader::MainThreadBridge::didSendData):
(WebCore::workerGlobalScopeDidReceiveResponse):
(WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse):
(WebCore::workerGlobalScopeDidReceiveData):
(WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveData):
(WebCore::workerGlobalScopeDidFinishLoading):
(WebCore::WorkerThreadableLoader::MainThreadBridge::didFinishLoading):
(WebCore::workerGlobalScopeDidFail):
(WebCore::WorkerThreadableLoader::MainThreadBridge::didFail):
(WebCore::workerGlobalScopeDidFailAccessControlCheck):
(WebCore::WorkerThreadableLoader::MainThreadBridge::didFailAccessControlCheck):
(WebCore::workerGlobalScopeDidFailRedirectCheck):
(WebCore::WorkerThreadableLoader::MainThreadBridge::didFailRedirectCheck):
* loader/WorkerThreadableLoader.h:
(WebCore::WorkerThreadableLoader::create):
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::removeRequestFromCache):
* platform/blackberry/LocalFileSystemBlackBerry.cpp:
(WebCore::openFileSystem):
(WebCore::LocalFileSystem::deleteFileSystem):
* platform/blackberry/WorkerAsyncFileSystemBlackBerry.cpp:
(WebCore::WorkerAsyncFileSystemBlackBerry::WorkerAsyncFileSystemBlackBerry):
(WebCore::WorkerAsyncFileSystemBlackBerry::openFileSystem):
(WebCore::WorkerAsyncFileSystemBlackBerry::deleteFileSystem):
* platform/blackberry/WorkerAsyncFileSystemBlackBerry.h:
(WebCore::WorkerAsyncFileSystemBlackBerry::create):
* platform/blackberry/WorkerAsyncFileWriterBlackBerry.h:
* platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.cpp:
(WebCore::WorkerPlatformAsyncFileSystemCallbacks::postTaskToWorkerThread):
* platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.h:
* platform/blackberry/WorkerPlatformFileWriterClient.cpp:
(WebCore::WorkerPlatformFileWriterClient::postTaskToWorkerThreadIfNeeded):
* platform/blackberry/WorkerPlatformFileWriterClient.h:
* workers/DedicatedWorkerGlobalScope.cpp: Renamed from Source/WebCore/workers/DedicatedWorkerContext.cpp.
(WebCore::DedicatedWorkerGlobalScope::create):
(WebCore::DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope):
(WebCore::DedicatedWorkerGlobalScope::~DedicatedWorkerGlobalScope):
(WebCore::DedicatedWorkerGlobalScope::interfaceName):
(WebCore::DedicatedWorkerGlobalScope::postMessage):
(WebCore::DedicatedWorkerGlobalScope::importScripts):
(WebCore::DedicatedWorkerGlobalScope::thread):
* workers/DedicatedWorkerGlobalScope.h: Renamed from Source/WebCore/workers/DedicatedWorkerContext.h.
* workers/DedicatedWorkerGlobalScope.idl: Renamed from Source/WebCore/workers/DedicatedWorkerContext.idl.
* workers/DedicatedWorkerThread.cpp:
(WebCore::DedicatedWorkerThread::createWorkerGlobalScope):
(WebCore::DedicatedWorkerThread::runEventLoop):
* workers/DedicatedWorkerThread.h:
* workers/DefaultSharedWorkerRepository.cpp:
(WebCore::SharedWorkerProxy::postTaskForModeToWorkerGlobalScope):
(WebCore::SharedWorkerProxy::workerGlobalScopeClosed):
(WebCore::SharedWorkerProxy::workerGlobalScopeDestroyed):
(WebCore::SharedWorkerConnectTask::performTask):
(WebCore::SharedWorkerScriptLoader::notifyFinished):
(WebCore::DefaultSharedWorkerRepository::workerScriptLoaded):
* workers/SharedWorkerGlobalScope.cpp: Renamed from Source/WebCore/workers/SharedWorkerContext.cpp.
(WebCore::createConnectEvent):
(WebCore::SharedWorkerGlobalScope::create):
(WebCore::SharedWorkerGlobalScope::SharedWorkerGlobalScope):
(WebCore::SharedWorkerGlobalScope::~SharedWorkerGlobalScope):
(WebCore::SharedWorkerGlobalScope::interfaceName):
(WebCore::SharedWorkerGlobalScope::thread):
(WebCore::SharedWorkerGlobalScope::logExceptionToConsole):
* workers/SharedWorkerGlobalScope.h: Renamed from Source/WebCore/workers/SharedWorkerContext.h.
(WebCore::SharedWorkerGlobalScope::name):
* workers/SharedWorkerGlobalScope.idl: Renamed from Source/WebCore/workers/SharedWorkerContext.idl.
* workers/SharedWorkerThread.cpp:
(WebCore::SharedWorkerThread::createWorkerGlobalScope):
* workers/SharedWorkerThread.h:
* workers/Worker.cpp:
(WebCore::Worker::Worker):
(WebCore::Worker::postMessage):
(WebCore::Worker::terminate):
(WebCore::Worker::notifyFinished):
* workers/Worker.h:
* workers/WorkerGlobalScope.cpp: Renamed from Source/WebCore/workers/WorkerContext.cpp.
(WebCore::CloseWorkerGlobalScopeTask::create):
(WebCore::CloseWorkerGlobalScopeTask::performTask):
(WebCore::CloseWorkerGlobalScopeTask::isCleanupTask):
(WebCore::WorkerGlobalScope::WorkerGlobalScope):
(WebCore::WorkerGlobalScope::~WorkerGlobalScope):
(WebCore::WorkerGlobalScope::applyContentSecurityPolicyFromString):
(WebCore::WorkerGlobalScope::scriptExecutionContext):
(WebCore::WorkerGlobalScope::virtualURL):
(WebCore::WorkerGlobalScope::virtualCompleteURL):
(WebCore::WorkerGlobalScope::completeURL):
(WebCore::WorkerGlobalScope::userAgent):
(WebCore::WorkerGlobalScope::disableEval):
(WebCore::WorkerGlobalScope::location):
(WebCore::WorkerGlobalScope::close):
(WebCore::WorkerGlobalScope::navigator):
(WebCore::WorkerGlobalScope::hasPendingActivity):
(WebCore::WorkerGlobalScope::postTask):
(WebCore::WorkerGlobalScope::setTimeout):
(WebCore::WorkerGlobalScope::clearTimeout):
(WebCore::WorkerGlobalScope::clearInspector):
(WebCore::WorkerGlobalScope::setInterval):
(WebCore::WorkerGlobalScope::clearInterval):
(WebCore::WorkerGlobalScope::importScripts):
(WebCore::WorkerGlobalScope::errorEventTarget):
(WebCore::WorkerGlobalScope::logExceptionToConsole):
(WebCore::WorkerGlobalScope::addConsoleMessage):
(WebCore::WorkerGlobalScope::addMessage):
(WebCore::WorkerGlobalScope::addMessageToWorkerConsole):
(WebCore::WorkerGlobalScope::isContextThread):
(WebCore::WorkerGlobalScope::isJSExecutionForbidden):
(WebCore::WorkerGlobalScope::eventTargetData):
(WebCore::WorkerGlobalScope::ensureEventTargetData):
(WebCore::WorkerGlobalScope::Observer::Observer):
(WebCore::WorkerGlobalScope::Observer::~Observer):
(WebCore::WorkerGlobalScope::Observer::stopObserving):
(WebCore::WorkerGlobalScope::registerObserver):
(WebCore::WorkerGlobalScope::unregisterObserver):
(WebCore::WorkerGlobalScope::notifyObserversOfStop):
(WebCore::WorkerGlobalScope::eventQueue):
* workers/WorkerGlobalScope.h: Renamed from Source/WebCore/workers/WorkerContext.h.
(WebCore::WorkerGlobalScope::isSharedWorkerGlobalScope):
(WebCore::WorkerGlobalScope::isDedicatedWorkerGlobalScope):
(WebCore::WorkerGlobalScope::url):
(WebCore::WorkerGlobalScope::groupSettings):
(WebCore::WorkerGlobalScope::script):
(WebCore::WorkerGlobalScope::clearScript):
(WebCore::WorkerGlobalScope::thread):
(WebCore::WorkerGlobalScope::self):
(WebCore::WorkerGlobalScope::workerInspectorController):
(WebCore::WorkerGlobalScope::optionalNavigator):
(WebCore::WorkerGlobalScope::optionalLocation):
(WebCore::WorkerGlobalScope::isClosing):
* workers/WorkerGlobalScope.idl: Renamed from Source/WebCore/workers/WorkerContext.idl.
* workers/WorkerGlobalScopeProxy.h: Renamed from Source/WebCore/workers/WorkerContextProxy.h.
(WebCore::WorkerGlobalScopeProxy::~WorkerGlobalScopeProxy):
(WebCore::WorkerGlobalScopeProxy::PageInspector::~PageInspector):
(WebCore::WorkerGlobalScopeProxy::connectToInspector):
(WebCore::WorkerGlobalScopeProxy::disconnectFromInspector):
(WebCore::WorkerGlobalScopeProxy::sendMessageToInspector):
* workers/WorkerLoaderProxy.h:
* workers/WorkerMessagingProxy.cpp:
(WebCore::MessageWorkerGlobalScopeTask::create):
(WebCore::MessageWorkerGlobalScopeTask::MessageWorkerGlobalScopeTask):
(WebCore::MessageWorkerGlobalScopeTask::performTask):
(WebCore::WorkerGlobalScopeDestroyedTask::create):
(WebCore::WorkerGlobalScopeDestroyedTask::WorkerGlobalScopeDestroyedTask):
(WebCore::WorkerGlobalScopeDestroyedTask::performTask):
(WebCore::WorkerTerminateTask::performTask):
(WebCore::PostMessageToPageInspectorTask::performTask):
(WebCore::WorkerGlobalScopeProxy::create):
(WebCore::WorkerMessagingProxy::WorkerMessagingProxy):
(WebCore::WorkerMessagingProxy::~WorkerMessagingProxy):
(WebCore::WorkerMessagingProxy::startWorkerGlobalScope):
(WebCore::WorkerMessagingProxy::postMessageToWorkerGlobalScope):
(WebCore::WorkerMessagingProxy::postTaskForModeToWorkerGlobalScope):
(WebCore::WorkerMessagingProxy::workerObjectDestroyedInternal):
(WebCore::connectToWorkerGlobalScopeInspectorTask):
(WebCore::WorkerMessagingProxy::connectToInspector):
(WebCore::disconnectFromWorkerGlobalScopeInspectorTask):
(WebCore::WorkerMessagingProxy::disconnectFromInspector):
(WebCore::dispatchOnInspectorBackendTask):
(WebCore::WorkerMessagingProxy::workerGlobalScopeDestroyed):
(WebCore::WorkerMessagingProxy::workerGlobalScopeClosed):
(WebCore::WorkerMessagingProxy::workerGlobalScopeDestroyedInternal):
(WebCore::WorkerMessagingProxy::terminateWorkerGlobalScope):
* workers/WorkerMessagingProxy.h:
* workers/WorkerObjectProxy.h:
* workers/WorkerReportingProxy.h:
* workers/WorkerRunLoop.cpp:
(WebCore::WorkerRunLoop::run):
(WebCore::WorkerRunLoop::runInMode):
(WebCore::WorkerRunLoop::runCleanupTasks):
(WebCore::WorkerRunLoop::Task::performTask):
* workers/WorkerRunLoop.h:
* workers/WorkerScriptLoader.cpp:
(WebCore::WorkerScriptLoader::loadSynchronously):
* workers/WorkerThread.cpp:
(WebCore::WorkerThread::workerThread):
(WebCore::WorkerThread::runEventLoop):
(WebCore::WorkerThreadShutdownFinishTask::performTask):
(WebCore::WorkerThreadShutdownStartTask::performTask):
(WebCore::WorkerThread::stop):
* workers/WorkerThread.h:
(WebCore::WorkerThread::workerGlobalScope):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::usesDashboardBackwardCompatibilityMode):
(WebCore::XMLHttpRequest::responseXML):

Source/WebKit/qt:

Update calls to ScriptExecutionContext::isWorkerContext() as it was
renamed to ScriptExecutionContext::isWorkerGlobalScope().

* WebCoreSupport/NotificationPresenterClientQt.cpp:
(WebCore::NotificationPresenterClientQt::show):
(WebCore::NotificationPresenterClientQt::toPage):
(WebCore::NotificationPresenterClientQt::toFrame):

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

125 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.cpp
Source/WebCore/DerivedSources.make
Source/WebCore/DerivedSources.pri
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Modules/filesystem/WorkerGlobalScopeFileSystem.cpp [moved from Source/WebCore/Modules/filesystem/WorkerContextFileSystem.cpp with 84% similarity]
Source/WebCore/Modules/filesystem/WorkerGlobalScopeFileSystem.h [moved from Source/WebCore/Modules/filesystem/WorkerContextFileSystem.h with 73% similarity]
Source/WebCore/Modules/filesystem/WorkerGlobalScopeFileSystem.idl [moved from Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl with 98% similarity]
Source/WebCore/Modules/indexeddb/IDBFactory.cpp
Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp [moved from Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.cpp with 73% similarity]
Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h [moved from Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.h with 83% similarity]
Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl [moved from Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl with 98% similarity]
Source/WebCore/Modules/notifications/Notification.cpp
Source/WebCore/Modules/notifications/NotificationCenter.cpp
Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.cpp [moved from Source/WebCore/Modules/notifications/WorkerContextNotifications.cpp with 69% similarity]
Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.h [moved from Source/WebCore/Modules/notifications/WorkerContextNotifications.h with 77% similarity]
Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.idl [moved from Source/WebCore/Modules/notifications/WorkerContextNotifications.idl with 97% similarity]
Source/WebCore/Modules/webdatabase/DatabaseContext.cpp
Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp [moved from Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.cpp with 86% similarity]
Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h [moved from Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.h with 69% similarity]
Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl [moved from Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.idl with 97% similarity]
Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp
Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h
Source/WebCore/Target.pri
Source/WebCore/UseJSC.cmake
Source/WebCore/WebCore.order
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/cpp/WebDOMEventTarget.cpp
Source/WebCore/bindings/cpp/WebDOMEventTarget.h
Source/WebCore/bindings/generic/ActiveDOMCallback.cpp
Source/WebCore/bindings/js/DOMRequestState.h
Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
Source/WebCore/bindings/js/JSDOMBinding.h
Source/WebCore/bindings/js/JSDOMGlobalObject.cpp
Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp [moved from Source/WebCore/bindings/js/JSDedicatedWorkerContextCustom.cpp with 94% similarity]
Source/WebCore/bindings/js/JSEventListener.cpp
Source/WebCore/bindings/js/JSEventTargetCustom.cpp
Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp [moved from Source/WebCore/bindings/js/JSWorkerContextBase.cpp with 57% similarity]
Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h [moved from Source/WebCore/bindings/js/JSWorkerContextBase.h with 70% similarity]
Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp [moved from Source/WebCore/bindings/js/JSWorkerContextCustom.cpp with 86% similarity]
Source/WebCore/bindings/js/ScheduledAction.cpp
Source/WebCore/bindings/js/ScheduledAction.h
Source/WebCore/bindings/js/ScriptProfiler.cpp
Source/WebCore/bindings/js/ScriptProfiler.h
Source/WebCore/bindings/js/ScriptState.cpp
Source/WebCore/bindings/js/ScriptState.h
Source/WebCore/bindings/js/WorkerScriptController.cpp
Source/WebCore/bindings/js/WorkerScriptController.h
Source/WebCore/bindings/js/WorkerScriptDebugServer.cpp
Source/WebCore/bindings/js/WorkerScriptDebugServer.h
Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
Source/WebCore/bindings/scripts/IDLAttributes.txt
Source/WebCore/bindings/scripts/preprocess-idls.pl
Source/WebCore/dom/ActiveDOMObject.cpp
Source/WebCore/dom/EventTarget.h
Source/WebCore/dom/EventTargetFactory.in
Source/WebCore/dom/MessagePort.cpp
Source/WebCore/dom/ScriptExecutionContext.cpp
Source/WebCore/dom/ScriptExecutionContext.h
Source/WebCore/inspector/InjectedScriptManager.cpp
Source/WebCore/inspector/InjectedScriptManager.h
Source/WebCore/inspector/InspectorConsoleInstrumentation.h
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InspectorProfilerAgent.cpp
Source/WebCore/inspector/InspectorProfilerAgent.h
Source/WebCore/inspector/InspectorRuntimeAgent.h
Source/WebCore/inspector/InspectorWorkerAgent.cpp
Source/WebCore/inspector/InspectorWorkerAgent.h
Source/WebCore/inspector/InstrumentingAgents.cpp
Source/WebCore/inspector/InstrumentingAgents.h
Source/WebCore/inspector/WorkerDebuggerAgent.cpp
Source/WebCore/inspector/WorkerDebuggerAgent.h
Source/WebCore/inspector/WorkerInspectorController.cpp
Source/WebCore/inspector/WorkerInspectorController.h
Source/WebCore/inspector/WorkerRuntimeAgent.cpp
Source/WebCore/inspector/WorkerRuntimeAgent.h
Source/WebCore/loader/ThreadableLoader.cpp
Source/WebCore/loader/WorkerThreadableLoader.cpp
Source/WebCore/loader/WorkerThreadableLoader.h
Source/WebCore/loader/cache/MemoryCache.cpp
Source/WebCore/platform/blackberry/LocalFileSystemBlackBerry.cpp
Source/WebCore/platform/blackberry/WorkerAsyncFileSystemBlackBerry.cpp
Source/WebCore/platform/blackberry/WorkerAsyncFileSystemBlackBerry.h
Source/WebCore/platform/blackberry/WorkerAsyncFileWriterBlackBerry.h
Source/WebCore/platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.cpp
Source/WebCore/platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.h
Source/WebCore/platform/blackberry/WorkerPlatformFileWriterClient.cpp
Source/WebCore/platform/blackberry/WorkerPlatformFileWriterClient.h
Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp [moved from Source/WebCore/workers/DedicatedWorkerContext.cpp with 65% similarity]
Source/WebCore/workers/DedicatedWorkerGlobalScope.h [moved from Source/WebCore/workers/DedicatedWorkerContext.h with 75% similarity]
Source/WebCore/workers/DedicatedWorkerGlobalScope.idl [moved from Source/WebCore/workers/DedicatedWorkerContext.idl with 96% similarity]
Source/WebCore/workers/DedicatedWorkerThread.cpp
Source/WebCore/workers/DedicatedWorkerThread.h
Source/WebCore/workers/DefaultSharedWorkerRepository.cpp
Source/WebCore/workers/SharedWorkerGlobalScope.cpp [moved from Source/WebCore/workers/SharedWorkerContext.cpp with 67% similarity]
Source/WebCore/workers/SharedWorkerGlobalScope.h [moved from Source/WebCore/workers/SharedWorkerContext.h with 73% similarity]
Source/WebCore/workers/SharedWorkerGlobalScope.idl [moved from Source/WebCore/workers/SharedWorkerContext.idl with 95% similarity]
Source/WebCore/workers/SharedWorkerThread.cpp
Source/WebCore/workers/SharedWorkerThread.h
Source/WebCore/workers/Worker.cpp
Source/WebCore/workers/Worker.h
Source/WebCore/workers/WorkerGlobalScope.cpp [moved from Source/WebCore/workers/WorkerContext.cpp with 71% similarity]
Source/WebCore/workers/WorkerGlobalScope.h [moved from Source/WebCore/workers/WorkerContext.h with 86% similarity]
Source/WebCore/workers/WorkerGlobalScope.idl [moved from Source/WebCore/workers/WorkerContext.idl with 91% similarity]
Source/WebCore/workers/WorkerGlobalScopeProxy.h [moved from Source/WebCore/workers/WorkerContextProxy.h with 80% similarity]
Source/WebCore/workers/WorkerLoaderProxy.h
Source/WebCore/workers/WorkerMessagingProxy.cpp
Source/WebCore/workers/WorkerMessagingProxy.h
Source/WebCore/workers/WorkerObjectProxy.h
Source/WebCore/workers/WorkerReportingProxy.h
Source/WebCore/workers/WorkerRunLoop.cpp
Source/WebCore/workers/WorkerRunLoop.h
Source/WebCore/workers/WorkerScriptLoader.cpp
Source/WebCore/workers/WorkerThread.cpp
Source/WebCore/workers/WorkerThread.h
Source/WebCore/xml/XMLHttpRequest.cpp
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp

index 6289bd1..ad3852e 100644 (file)
@@ -177,7 +177,7 @@ set(WebCore_IDL_FILES
     Modules/filesystem/HTMLInputElementFileSystem.idl
     Modules/filesystem/Metadata.idl
     Modules/filesystem/MetadataCallback.idl
-    Modules/filesystem/WorkerContextFileSystem.idl
+    Modules/filesystem/WorkerGlobalScopeFileSystem.idl
 
     Modules/gamepad/Gamepad.idl
     Modules/gamepad/GamepadList.idl
@@ -204,7 +204,7 @@ set(WebCore_IDL_FILES
     Modules/indexeddb/IDBRequest.idl
     Modules/indexeddb/IDBTransaction.idl
     Modules/indexeddb/IDBVersionChangeEvent.idl
-    Modules/indexeddb/WorkerContextIndexedDatabase.idl
+    Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl
 
     Modules/mediasource/MediaSource.idl
     Modules/mediasource/SourceBuffer.idl
@@ -242,7 +242,7 @@ set(WebCore_IDL_FILES
     Modules/notifications/Notification.idl
     Modules/notifications/NotificationCenter.idl
     Modules/notifications/NotificationPermissionCallback.idl
-    Modules/notifications/WorkerContextNotifications.idl
+    Modules/notifications/WorkerGlobalScopeNotifications.idl
 
     Modules/proximity/DeviceProximityEvent.idl
 
@@ -589,11 +589,11 @@ set(WebCore_IDL_FILES
     storage/StorageEvent.idl
 
     workers/AbstractWorker.idl
-    workers/DedicatedWorkerContext.idl
+    workers/DedicatedWorkerGlobalScope.idl
     workers/SharedWorker.idl
-    workers/SharedWorkerContext.idl
+    workers/SharedWorkerGlobalScope.idl
     workers/Worker.idl
-    workers/WorkerContext.idl
+    workers/WorkerGlobalScope.idl
     workers/WorkerLocation.idl
 
     xml/DOMParser.idl
@@ -794,7 +794,7 @@ set(WebCore_SOURCES
     Modules/filesystem/FileWriterSync.cpp
     Modules/filesystem/HTMLInputElementFileSystem.cpp
     Modules/filesystem/LocalFileSystem.cpp
-    Modules/filesystem/WorkerContextFileSystem.cpp
+    Modules/filesystem/WorkerGlobalScopeFileSystem.cpp
 
     Modules/gamepad/Gamepad.cpp
     Modules/gamepad/GamepadList.cpp
@@ -834,7 +834,7 @@ set(WebCore_SOURCES
     Modules/indexeddb/IDBTransactionCoordinator.cpp
     Modules/indexeddb/IDBVersionChangeEvent.cpp
     Modules/indexeddb/PageGroupIndexedDatabase.cpp
-    Modules/indexeddb/WorkerContextIndexedDatabase.cpp
+    Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp
 
     Modules/mediasource/MediaSource.cpp
     Modules/mediasource/MediaSourceRegistry.cpp
@@ -876,7 +876,7 @@ set(WebCore_SOURCES
     Modules/notifications/NotificationCenter.cpp
     Modules/notifications/NotificationController.cpp
     Modules/notifications/Notification.cpp
-    Modules/notifications/WorkerContextNotifications.cpp
+    Modules/notifications/WorkerGlobalScopeNotifications.cpp
 
     Modules/proximity/DeviceProximityController.cpp
     Modules/proximity/DeviceProximityEvent.cpp
@@ -2498,15 +2498,15 @@ set(WebCore_SOURCES
     svg/properties/SVGPathSegListPropertyTearOff.cpp
 
     workers/AbstractWorker.cpp
-    workers/DedicatedWorkerContext.cpp
+    workers/DedicatedWorkerGlobalScope.cpp
     workers/DedicatedWorkerThread.cpp
     workers/DefaultSharedWorkerRepository.cpp
     workers/SharedWorker.cpp
-    workers/SharedWorkerContext.cpp
+    workers/SharedWorkerGlobalScope.cpp
     workers/SharedWorkerRepository.cpp
     workers/SharedWorkerThread.cpp
     workers/Worker.cpp
-    workers/WorkerContext.cpp
+    workers/WorkerGlobalScope.cpp
     workers/WorkerEventQueue.cpp
     workers/WorkerLocation.cpp
     workers/WorkerMessagingProxy.cpp
@@ -2594,11 +2594,11 @@ set(WebCore_LIBRARIES
 
 if (ENABLE_SQL_DATABASE AND ENABLE_WORKERS)
     list(APPEND WebCore_SOURCES
-        Modules/webdatabase/WorkerContextWebDatabase.cpp
+        Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp
     )
 
     list(APPEND WebCore_IDL_FILES
-        Modules/webdatabase/WorkerContextWebDatabase.idl
+        Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl
     )
 endif ()
 
@@ -2961,7 +2961,7 @@ set(SCRIPTS_BINDINGS
 set(IDL_FILES_TMP ${DERIVED_SOURCES_WEBCORE_DIR}/idl_files.tmp)
 set(SUPPLEMENTAL_DEPENDENCY_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/supplemental_dependency.tmp)
 set(WINDOW_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowConstructors.idl)
-set(WORKERCONTEXT_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/WorkerContextConstructors.idl)
+set(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/WorkerGlobalScopeConstructors.idl)
 set(IDL_ATTRIBUTES_FILE ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
 
 include(${WEBCORE_DIR}/UseJSC.cmake)
index d35b608..26caa80 100644 (file)
@@ -1,3 +1,433 @@
+2013-06-26  Christophe Dumez  <ch.dumez@sisa.samsung.com>
+
+        Rename WorkerContext to WorkerGlobalScope
+        https://bugs.webkit.org/show_bug.cgi?id=118059
+
+        Reviewed by Kentaro Hara.
+
+        Rename WorkerContext / SharedWorkerContext / DedicatedWorkerContext to
+        WorkerGlobalScope / SharedWorkerGlobalScope / DedicatedWorkerGlobalScope
+        to match the latest specification:
+        http://www.whatwg.org/specs/web-apps/current-work/multipage/workers.html#workerglobalscope
+
+        Those interfaces have [NoInterfaceObject] IDL extended attribute so the
+        name did not matter much so far. However, the specification was updated
+        and [NoInterfaceObject] was removed. We should therefore rename those
+        interfaces as a preparation for this change.
+
+        No new tests, no behavior change as these interfaces are not exposed to
+        JavaScript yet.
+
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * DerivedSources.pri:
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * Modules/filesystem/WorkerGlobalScopeFileSystem.cpp: Renamed from Source/WebCore/Modules/filesystem/WorkerContextFileSystem.cpp.
+        (WebCore::WorkerGlobalScopeFileSystem::webkitRequestFileSystem):
+        (WebCore::WorkerGlobalScopeFileSystem::webkitRequestFileSystemSync):
+        (WebCore::WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemURL):
+        (WebCore::WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemSyncURL):
+        * Modules/filesystem/WorkerGlobalScopeFileSystem.h: Renamed from Source/WebCore/Modules/filesystem/WorkerContextFileSystem.h.
+        * Modules/filesystem/WorkerGlobalScopeFileSystem.idl: Renamed from Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl.
+        * Modules/indexeddb/IDBFactory.cpp:
+        * Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp: Renamed from Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.cpp.
+        (WebCore::WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase):
+        (WebCore::WorkerGlobalScopeIndexedDatabase::~WorkerGlobalScopeIndexedDatabase):
+        (WebCore::WorkerGlobalScopeIndexedDatabase::supplementName):
+        (WebCore::WorkerGlobalScopeIndexedDatabase::from):
+        (WebCore::WorkerGlobalScopeIndexedDatabase::indexedDB):
+        * Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h: Renamed from Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.h.
+        * Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl: Renamed from Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl.
+        * Modules/notifications/Notification.cpp:
+        * Modules/notifications/NotificationCenter.cpp:
+        * Modules/notifications/WorkerGlobalScopeNotifications.cpp: Renamed from Source/WebCore/Modules/notifications/WorkerContextNotifications.cpp.
+        (WebCore::WorkerGlobalScopeNotifications::WorkerGlobalScopeNotifications):
+        (WebCore::WorkerGlobalScopeNotifications::~WorkerGlobalScopeNotifications):
+        (WebCore::WorkerGlobalScopeNotifications::supplementName):
+        (WebCore::WorkerGlobalScopeNotifications::from):
+        (WebCore::WorkerGlobalScopeNotifications::webkitNotifications):
+        * Modules/notifications/WorkerGlobalScopeNotifications.h: Renamed from Source/WebCore/Modules/notifications/WorkerContextNotifications.h.
+        * Modules/notifications/WorkerGlobalScopeNotifications.idl: Renamed from Source/WebCore/Modules/notifications/WorkerContextNotifications.idl.
+        * Modules/webdatabase/DatabaseContext.cpp:
+        (WebCore::DatabaseContext::allowDatabaseAccess):
+        (WebCore::DatabaseContext::databaseExceededQuota):
+        * Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp: Renamed from Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.cpp.
+        (WebCore::WorkerGlobalScopeWebDatabase::openDatabase):
+        (WebCore::WorkerGlobalScopeWebDatabase::openDatabaseSync):
+        * Modules/webdatabase/WorkerGlobalScopeWebDatabase.h: Renamed from Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.h.
+        (WebCore::WorkerGlobalScopeWebDatabase::WorkerGlobalScopeWebDatabase):
+        (WebCore::WorkerGlobalScopeWebDatabase::~WorkerGlobalScopeWebDatabase):
+        * Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl: Renamed from Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.idl.
+        * Modules/websockets/ThreadableWebSocketChannel.cpp:
+        (WebCore::ThreadableWebSocketChannel::create):
+        * Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+        (WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback):
+        * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+        (WebCore::WorkerThreadableWebSocketChannel::WorkerThreadableWebSocketChannel):
+        (WebCore::workerGlobalScopeDidSend):
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::send):
+        (WebCore::workerGlobalScopeDidGetBufferedAmount):
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::bufferedAmount):
+        (WebCore::workerGlobalScopeDidConnect):
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::didConnect):
+        (WebCore::workerGlobalScopeDidReceiveMessage):
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessage):
+        (WebCore::workerGlobalScopeDidReceiveBinaryData):
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
+        (WebCore::workerGlobalScopeDidUpdateBufferedAmount):
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount):
+        (WebCore::workerGlobalScopeDidStartClosingHandshake):
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake):
+        (WebCore::workerGlobalScopeDidClose):
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::didClose):
+        (WebCore::workerGlobalScopeDidReceiveMessageError):
+        (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError):
+        (WebCore::WorkerThreadableWebSocketChannel::Bridge::Bridge):
+        (WebCore::WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask::create):
+        (WebCore::WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask::~WorkerGlobalScopeDidInitializeTask):
+        (WebCore::WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask::WorkerGlobalScopeDidInitializeTask):
+        (WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize):
+        (WebCore::WorkerThreadableWebSocketChannel::Bridge::disconnect):
+        (WebCore::WorkerThreadableWebSocketChannel::Bridge::waitForMethodCompletion):
+        * Modules/websockets/WorkerThreadableWebSocketChannel.h:
+        (WebCore::WorkerThreadableWebSocketChannel::create):
+        (WebCore::WorkerThreadableWebSocketChannel::Bridge::create):
+        * Target.pri:
+        * UseJSC.cmake:
+        * WebCore.order:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/cpp/WebDOMEventTarget.cpp:
+        (toWebKit):
+        * bindings/cpp/WebDOMEventTarget.h:
+        * bindings/generic/ActiveDOMCallback.cpp:
+        * bindings/js/DOMRequestState.h:
+        (WebCore::DOMRequestState::DOMRequestState):
+        * bindings/js/JSBindingsAllInOne.cpp:
+        * bindings/js/JSDOMBinding.h:
+        * bindings/js/JSDOMGlobalObject.cpp:
+        (WebCore::JSDOMGlobalObject::scriptExecutionContext):
+        (WebCore::toJSDOMGlobalObject):
+        * bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp: Renamed from Source/WebCore/bindings/js/JSDedicatedWorkerContextCustom.cpp.
+        (WebCore::JSDedicatedWorkerGlobalScope::postMessage):
+        * bindings/js/JSEventListener.cpp:
+        (WebCore::JSEventListener::handleEvent):
+        * bindings/js/JSEventTargetCustom.cpp:
+        (WebCore::toJS):
+        * bindings/js/JSWorkerGlobalScopeBase.cpp: Renamed from Source/WebCore/bindings/js/JSWorkerContextBase.cpp.
+        (WebCore::JSWorkerGlobalScopeBase::JSWorkerGlobalScopeBase):
+        (WebCore::JSWorkerGlobalScopeBase::finishCreation):
+        (WebCore::JSWorkerGlobalScopeBase::destroy):
+        (WebCore::JSWorkerGlobalScopeBase::scriptExecutionContext):
+        (WebCore::toJS):
+        (WebCore::toJSDedicatedWorkerGlobalScope):
+        (WebCore::toJSSharedWorkerGlobalScope):
+        (WebCore::toJSWorkerGlobalScope):
+        * bindings/js/JSWorkerGlobalScopeBase.h: Renamed from Source/WebCore/bindings/js/JSWorkerContextBase.h.
+        (WebCore::JSWorkerGlobalScopeBase::impl):
+        (WebCore::JSWorkerGlobalScopeBase::createStructure):
+        * bindings/js/JSWorkerGlobalScopeCustom.cpp: Renamed from Source/WebCore/bindings/js/JSWorkerContextCustom.cpp.
+        (WebCore::JSWorkerGlobalScope::visitChildren):
+        (WebCore::JSWorkerGlobalScope::getOwnPropertySlotDelegate):
+        (WebCore::JSWorkerGlobalScope::getOwnPropertyDescriptorDelegate):
+        (WebCore::JSWorkerGlobalScope::importScripts):
+        (WebCore::JSWorkerGlobalScope::setTimeout):
+        (WebCore::JSWorkerGlobalScope::setInterval):
+        * bindings/js/ScheduledAction.cpp:
+        (WebCore::ScheduledAction::execute):
+        * bindings/js/ScheduledAction.h:
+        * bindings/js/ScriptProfiler.cpp:
+        (WebCore::ScriptProfiler::startForWorkerGlobalScope):
+        (WebCore::ScriptProfiler::stopForWorkerGlobalScope):
+        * bindings/js/ScriptProfiler.h:
+        * bindings/js/ScriptState.cpp:
+        (WebCore::scriptStateFromWorkerGlobalScope):
+        * bindings/js/ScriptState.h:
+        * bindings/js/WorkerScriptController.cpp:
+        (WebCore::WorkerScriptController::WorkerScriptController):
+        (WebCore::WorkerScriptController::~WorkerScriptController):
+        (WebCore::WorkerScriptController::initScript):
+        (WebCore::WorkerScriptController::evaluate):
+        (WebCore::WorkerScriptController::setException):
+        (WebCore::WorkerScriptController::forbidExecution):
+        (WebCore::WorkerScriptController::isExecutionForbidden):
+        (WebCore::WorkerScriptController::disableEval):
+        (WebCore::WorkerScriptController::attachDebugger):
+        (WebCore::WorkerScriptController::detachDebugger):
+        * bindings/js/WorkerScriptController.h:
+        (WebCore::WorkerScriptController::workerGlobalScopeWrapper):
+        (WebCore::WorkerScriptController::initScriptIfNeeded):
+        * bindings/js/WorkerScriptDebugServer.cpp:
+        (WebCore::WorkerScriptDebugServer::WorkerScriptDebugServer):
+        (WebCore::WorkerScriptDebugServer::addListener):
+        (WebCore::WorkerScriptDebugServer::recompileAllJSFunctions):
+        (WebCore::WorkerScriptDebugServer::removeListener):
+        (WebCore::WorkerScriptDebugServer::runEventLoopWhilePaused):
+        * bindings/js/WorkerScriptDebugServer.h:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateHeader):
+        (GenerateImplementation):
+        * bindings/scripts/IDLAttributes.txt:
+        * bindings/scripts/preprocess-idls.pl:
+        * dom/ActiveDOMObject.cpp:
+        * dom/EventTarget.h:
+        * dom/EventTargetFactory.in:
+        * dom/MessagePort.cpp:
+        (WebCore::MessagePort::dispatchMessages):
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::createdMessagePort):
+        (WebCore::ScriptExecutionContext::destroyedMessagePort):
+        (WebCore::ScriptExecutionContext::vm):
+        * dom/ScriptExecutionContext.h:
+        (WebCore::ScriptExecutionContext::isWorkerGlobalScope):
+        * inspector/InjectedScriptManager.cpp:
+        (WebCore::InjectedScriptManager::createForWorker):
+        (WebCore::InjectedScriptManager::canAccessInspectedWorkerGlobalScope):
+        * inspector/InjectedScriptManager.h:
+        * inspector/InspectorConsoleInstrumentation.h:
+        (WebCore::InspectorInstrumentation::addMessageToConsole):
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didStartWorkerGlobalScopeImpl):
+        (WebCore::InspectorInstrumentation::willEvaluateWorkerScript):
+        (WebCore::InspectorInstrumentation::workerGlobalScopeTerminatedImpl):
+        (WebCore::InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope):
+        (WebCore::InspectorInstrumentation::instrumentingAgentsForNonDocumentContext):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::didStartWorkerGlobalScope):
+        (WebCore::InspectorInstrumentation::workerGlobalScopeTerminated):
+        * inspector/InspectorProfilerAgent.cpp:
+        (WebCore::WorkerProfilerAgent::WorkerProfilerAgent):
+        (WebCore::WorkerProfilerAgent::startProfiling):
+        (WebCore::WorkerProfilerAgent::stopProfiling):
+        (WebCore::InspectorProfilerAgent::create):
+        * inspector/InspectorProfilerAgent.h:
+        * inspector/InspectorRuntimeAgent.h:
+        * inspector/InspectorWorkerAgent.cpp:
+        (WebCore::InspectorWorkerAgent::WorkerFrontendChannel::WorkerFrontendChannel):
+        (WebCore::InspectorWorkerAgent::WorkerFrontendChannel::~WorkerFrontendChannel):
+        (WebCore::InspectorWorkerAgent::WorkerFrontendChannel::proxy):
+        (WebCore::InspectorWorkerAgent::WorkerFrontendChannel::connectToWorkerGlobalScope):
+        (WebCore::InspectorWorkerAgent::WorkerFrontendChannel::disconnectFromWorkerGlobalScope):
+        (WebCore::InspectorWorkerAgent::connectToWorker):
+        (WebCore::InspectorWorkerAgent::disconnectFromWorker):
+        (WebCore::InspectorWorkerAgent::didStartWorkerGlobalScope):
+        (WebCore::InspectorWorkerAgent::workerGlobalScopeTerminated):
+        (WebCore::InspectorWorkerAgent::destroyWorkerFrontendChannels):
+        (WebCore::InspectorWorkerAgent::createWorkerFrontendChannel):
+        * inspector/InspectorWorkerAgent.h:
+        * inspector/InstrumentingAgents.cpp:
+        (WebCore::instrumentationForWorkerGlobalScope):
+        * inspector/InstrumentingAgents.h:
+        * inspector/WorkerDebuggerAgent.cpp:
+        (WebCore::WorkerDebuggerAgent::create):
+        (WebCore::WorkerDebuggerAgent::WorkerDebuggerAgent):
+        (WebCore::WorkerDebuggerAgent::~WorkerDebuggerAgent):
+        (WebCore::WorkerDebuggerAgent::interruptAndDispatchInspectorCommands):
+        (WebCore::WorkerDebuggerAgent::injectedScriptForEval):
+        * inspector/WorkerDebuggerAgent.h:
+        * inspector/WorkerInspectorController.cpp:
+        (WebCore::WorkerInspectorController::WorkerInspectorController):
+        (WebCore::WorkerInspectorController::connectFrontend):
+        * inspector/WorkerInspectorController.h:
+        * inspector/WorkerRuntimeAgent.cpp:
+        (WebCore::WorkerRuntimeAgent::WorkerRuntimeAgent):
+        (WebCore::WorkerRuntimeAgent::injectedScriptForEval):
+        (WebCore::WorkerRuntimeAgent::pauseWorkerGlobalScope):
+        * inspector/WorkerRuntimeAgent.h:
+        (WebCore::WorkerRuntimeAgent::create):
+        * loader/ThreadableLoader.cpp:
+        (WebCore::ThreadableLoader::create):
+        (WebCore::ThreadableLoader::loadResourceSynchronously):
+        * loader/WorkerThreadableLoader.cpp:
+        (WebCore::WorkerThreadableLoader::WorkerThreadableLoader):
+        (WebCore::WorkerThreadableLoader::loadResourceSynchronously):
+        (WebCore::workerGlobalScopeDidSendData):
+        (WebCore::WorkerThreadableLoader::MainThreadBridge::didSendData):
+        (WebCore::workerGlobalScopeDidReceiveResponse):
+        (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveResponse):
+        (WebCore::workerGlobalScopeDidReceiveData):
+        (WebCore::WorkerThreadableLoader::MainThreadBridge::didReceiveData):
+        (WebCore::workerGlobalScopeDidFinishLoading):
+        (WebCore::WorkerThreadableLoader::MainThreadBridge::didFinishLoading):
+        (WebCore::workerGlobalScopeDidFail):
+        (WebCore::WorkerThreadableLoader::MainThreadBridge::didFail):
+        (WebCore::workerGlobalScopeDidFailAccessControlCheck):
+        (WebCore::WorkerThreadableLoader::MainThreadBridge::didFailAccessControlCheck):
+        (WebCore::workerGlobalScopeDidFailRedirectCheck):
+        (WebCore::WorkerThreadableLoader::MainThreadBridge::didFailRedirectCheck):
+        * loader/WorkerThreadableLoader.h:
+        (WebCore::WorkerThreadableLoader::create):
+        * loader/cache/MemoryCache.cpp:
+        (WebCore::MemoryCache::removeRequestFromCache):
+        * platform/blackberry/LocalFileSystemBlackBerry.cpp:
+        (WebCore::openFileSystem):
+        (WebCore::LocalFileSystem::deleteFileSystem):
+        * platform/blackberry/WorkerAsyncFileSystemBlackBerry.cpp:
+        (WebCore::WorkerAsyncFileSystemBlackBerry::WorkerAsyncFileSystemBlackBerry):
+        (WebCore::WorkerAsyncFileSystemBlackBerry::openFileSystem):
+        (WebCore::WorkerAsyncFileSystemBlackBerry::deleteFileSystem):
+        * platform/blackberry/WorkerAsyncFileSystemBlackBerry.h:
+        (WebCore::WorkerAsyncFileSystemBlackBerry::create):
+        * platform/blackberry/WorkerAsyncFileWriterBlackBerry.h:
+        * platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.cpp:
+        (WebCore::WorkerPlatformAsyncFileSystemCallbacks::postTaskToWorkerThread):
+        * platform/blackberry/WorkerPlatformAsyncFileSystemCallbacks.h:
+        * platform/blackberry/WorkerPlatformFileWriterClient.cpp:
+        (WebCore::WorkerPlatformFileWriterClient::postTaskToWorkerThreadIfNeeded):
+        * platform/blackberry/WorkerPlatformFileWriterClient.h:
+        * workers/DedicatedWorkerGlobalScope.cpp: Renamed from Source/WebCore/workers/DedicatedWorkerContext.cpp.
+        (WebCore::DedicatedWorkerGlobalScope::create):
+        (WebCore::DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope):
+        (WebCore::DedicatedWorkerGlobalScope::~DedicatedWorkerGlobalScope):
+        (WebCore::DedicatedWorkerGlobalScope::interfaceName):
+        (WebCore::DedicatedWorkerGlobalScope::postMessage):
+        (WebCore::DedicatedWorkerGlobalScope::importScripts):
+        (WebCore::DedicatedWorkerGlobalScope::thread):
+        * workers/DedicatedWorkerGlobalScope.h: Renamed from Source/WebCore/workers/DedicatedWorkerContext.h.
+        * workers/DedicatedWorkerGlobalScope.idl: Renamed from Source/WebCore/workers/DedicatedWorkerContext.idl.
+        * workers/DedicatedWorkerThread.cpp:
+        (WebCore::DedicatedWorkerThread::createWorkerGlobalScope):
+        (WebCore::DedicatedWorkerThread::runEventLoop):
+        * workers/DedicatedWorkerThread.h:
+        * workers/DefaultSharedWorkerRepository.cpp:
+        (WebCore::SharedWorkerProxy::postTaskForModeToWorkerGlobalScope):
+        (WebCore::SharedWorkerProxy::workerGlobalScopeClosed):
+        (WebCore::SharedWorkerProxy::workerGlobalScopeDestroyed):
+        (WebCore::SharedWorkerConnectTask::performTask):
+        (WebCore::SharedWorkerScriptLoader::notifyFinished):
+        (WebCore::DefaultSharedWorkerRepository::workerScriptLoaded):
+        * workers/SharedWorkerGlobalScope.cpp: Renamed from Source/WebCore/workers/SharedWorkerContext.cpp.
+        (WebCore::createConnectEvent):
+        (WebCore::SharedWorkerGlobalScope::create):
+        (WebCore::SharedWorkerGlobalScope::SharedWorkerGlobalScope):
+        (WebCore::SharedWorkerGlobalScope::~SharedWorkerGlobalScope):
+        (WebCore::SharedWorkerGlobalScope::interfaceName):
+        (WebCore::SharedWorkerGlobalScope::thread):
+        (WebCore::SharedWorkerGlobalScope::logExceptionToConsole):
+        * workers/SharedWorkerGlobalScope.h: Renamed from Source/WebCore/workers/SharedWorkerContext.h.
+        (WebCore::SharedWorkerGlobalScope::name):
+        * workers/SharedWorkerGlobalScope.idl: Renamed from Source/WebCore/workers/SharedWorkerContext.idl.
+        * workers/SharedWorkerThread.cpp:
+        (WebCore::SharedWorkerThread::createWorkerGlobalScope):
+        * workers/SharedWorkerThread.h:
+        * workers/Worker.cpp:
+        (WebCore::Worker::Worker):
+        (WebCore::Worker::postMessage):
+        (WebCore::Worker::terminate):
+        (WebCore::Worker::notifyFinished):
+        * workers/Worker.h:
+        * workers/WorkerGlobalScope.cpp: Renamed from Source/WebCore/workers/WorkerContext.cpp.
+        (WebCore::CloseWorkerGlobalScopeTask::create):
+        (WebCore::CloseWorkerGlobalScopeTask::performTask):
+        (WebCore::CloseWorkerGlobalScopeTask::isCleanupTask):
+        (WebCore::WorkerGlobalScope::WorkerGlobalScope):
+        (WebCore::WorkerGlobalScope::~WorkerGlobalScope):
+        (WebCore::WorkerGlobalScope::applyContentSecurityPolicyFromString):
+        (WebCore::WorkerGlobalScope::scriptExecutionContext):
+        (WebCore::WorkerGlobalScope::virtualURL):
+        (WebCore::WorkerGlobalScope::virtualCompleteURL):
+        (WebCore::WorkerGlobalScope::completeURL):
+        (WebCore::WorkerGlobalScope::userAgent):
+        (WebCore::WorkerGlobalScope::disableEval):
+        (WebCore::WorkerGlobalScope::location):
+        (WebCore::WorkerGlobalScope::close):
+        (WebCore::WorkerGlobalScope::navigator):
+        (WebCore::WorkerGlobalScope::hasPendingActivity):
+        (WebCore::WorkerGlobalScope::postTask):
+        (WebCore::WorkerGlobalScope::setTimeout):
+        (WebCore::WorkerGlobalScope::clearTimeout):
+        (WebCore::WorkerGlobalScope::clearInspector):
+        (WebCore::WorkerGlobalScope::setInterval):
+        (WebCore::WorkerGlobalScope::clearInterval):
+        (WebCore::WorkerGlobalScope::importScripts):
+        (WebCore::WorkerGlobalScope::errorEventTarget):
+        (WebCore::WorkerGlobalScope::logExceptionToConsole):
+        (WebCore::WorkerGlobalScope::addConsoleMessage):
+        (WebCore::WorkerGlobalScope::addMessage):
+        (WebCore::WorkerGlobalScope::addMessageToWorkerConsole):
+        (WebCore::WorkerGlobalScope::isContextThread):
+        (WebCore::WorkerGlobalScope::isJSExecutionForbidden):
+        (WebCore::WorkerGlobalScope::eventTargetData):
+        (WebCore::WorkerGlobalScope::ensureEventTargetData):
+        (WebCore::WorkerGlobalScope::Observer::Observer):
+        (WebCore::WorkerGlobalScope::Observer::~Observer):
+        (WebCore::WorkerGlobalScope::Observer::stopObserving):
+        (WebCore::WorkerGlobalScope::registerObserver):
+        (WebCore::WorkerGlobalScope::unregisterObserver):
+        (WebCore::WorkerGlobalScope::notifyObserversOfStop):
+        (WebCore::WorkerGlobalScope::eventQueue):
+        * workers/WorkerGlobalScope.h: Renamed from Source/WebCore/workers/WorkerContext.h.
+        (WebCore::WorkerGlobalScope::isSharedWorkerGlobalScope):
+        (WebCore::WorkerGlobalScope::isDedicatedWorkerGlobalScope):
+        (WebCore::WorkerGlobalScope::url):
+        (WebCore::WorkerGlobalScope::groupSettings):
+        (WebCore::WorkerGlobalScope::script):
+        (WebCore::WorkerGlobalScope::clearScript):
+        (WebCore::WorkerGlobalScope::thread):
+        (WebCore::WorkerGlobalScope::self):
+        (WebCore::WorkerGlobalScope::workerInspectorController):
+        (WebCore::WorkerGlobalScope::optionalNavigator):
+        (WebCore::WorkerGlobalScope::optionalLocation):
+        (WebCore::WorkerGlobalScope::isClosing):
+        * workers/WorkerGlobalScope.idl: Renamed from Source/WebCore/workers/WorkerContext.idl.
+        * workers/WorkerGlobalScopeProxy.h: Renamed from Source/WebCore/workers/WorkerContextProxy.h.
+        (WebCore::WorkerGlobalScopeProxy::~WorkerGlobalScopeProxy):
+        (WebCore::WorkerGlobalScopeProxy::PageInspector::~PageInspector):
+        (WebCore::WorkerGlobalScopeProxy::connectToInspector):
+        (WebCore::WorkerGlobalScopeProxy::disconnectFromInspector):
+        (WebCore::WorkerGlobalScopeProxy::sendMessageToInspector):
+        * workers/WorkerLoaderProxy.h:
+        * workers/WorkerMessagingProxy.cpp:
+        (WebCore::MessageWorkerGlobalScopeTask::create):
+        (WebCore::MessageWorkerGlobalScopeTask::MessageWorkerGlobalScopeTask):
+        (WebCore::MessageWorkerGlobalScopeTask::performTask):
+        (WebCore::WorkerGlobalScopeDestroyedTask::create):
+        (WebCore::WorkerGlobalScopeDestroyedTask::WorkerGlobalScopeDestroyedTask):
+        (WebCore::WorkerGlobalScopeDestroyedTask::performTask):
+        (WebCore::WorkerTerminateTask::performTask):
+        (WebCore::PostMessageToPageInspectorTask::performTask):
+        (WebCore::WorkerGlobalScopeProxy::create):
+        (WebCore::WorkerMessagingProxy::WorkerMessagingProxy):
+        (WebCore::WorkerMessagingProxy::~WorkerMessagingProxy):
+        (WebCore::WorkerMessagingProxy::startWorkerGlobalScope):
+        (WebCore::WorkerMessagingProxy::postMessageToWorkerGlobalScope):
+        (WebCore::WorkerMessagingProxy::postTaskForModeToWorkerGlobalScope):
+        (WebCore::WorkerMessagingProxy::workerObjectDestroyedInternal):
+        (WebCore::connectToWorkerGlobalScopeInspectorTask):
+        (WebCore::WorkerMessagingProxy::connectToInspector):
+        (WebCore::disconnectFromWorkerGlobalScopeInspectorTask):
+        (WebCore::WorkerMessagingProxy::disconnectFromInspector):
+        (WebCore::dispatchOnInspectorBackendTask):
+        (WebCore::WorkerMessagingProxy::workerGlobalScopeDestroyed):
+        (WebCore::WorkerMessagingProxy::workerGlobalScopeClosed):
+        (WebCore::WorkerMessagingProxy::workerGlobalScopeDestroyedInternal):
+        (WebCore::WorkerMessagingProxy::terminateWorkerGlobalScope):
+        * workers/WorkerMessagingProxy.h:
+        * workers/WorkerObjectProxy.h:
+        * workers/WorkerReportingProxy.h:
+        * workers/WorkerRunLoop.cpp:
+        (WebCore::WorkerRunLoop::run):
+        (WebCore::WorkerRunLoop::runInMode):
+        (WebCore::WorkerRunLoop::runCleanupTasks):
+        (WebCore::WorkerRunLoop::Task::performTask):
+        * workers/WorkerRunLoop.h:
+        * workers/WorkerScriptLoader.cpp:
+        (WebCore::WorkerScriptLoader::loadSynchronously):
+        * workers/WorkerThread.cpp:
+        (WebCore::WorkerThread::workerThread):
+        (WebCore::WorkerThread::runEventLoop):
+        (WebCore::WorkerThreadShutdownFinishTask::performTask):
+        (WebCore::WorkerThreadShutdownStartTask::performTask):
+        (WebCore::WorkerThread::stop):
+        * workers/WorkerThread.h:
+        (WebCore::WorkerThread::workerGlobalScope):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::usesDashboardBackwardCompatibilityMode):
+        (WebCore::XMLHttpRequest::responseXML):
+
 2013-06-26  Sanjoy Pal  <sanjoy.pal@samsung.com>
 
         Avoid redundant checks for Compositing reasons in RenderLayerCompositor
index 6b47e7d..3bc0b0b 100644 (file)
 #include "JSDataTransferItem.cpp"
 #include "JSDataTransferItemList.cpp"
 #include "JSDataView.cpp"
-#include "JSDedicatedWorkerContext.cpp"
+#include "JSDedicatedWorkerGlobalScope.cpp"
 #include "JSDeviceOrientationEvent.cpp"
 #include "JSDirectoryEntry.cpp"
 #include "JSDirectoryEntrySync.cpp"
 #include "JSScriptProfileNode.cpp"
 #include "JSShadowRoot.cpp"
 #include "JSSharedWorker.cpp"
-#include "JSSharedWorkerContext.cpp"
+#include "JSSharedWorkerGlobalScope.cpp"
 #if ENABLE(MEDIA_SOURCE)
 #include "JSSourceBuffer.cpp"
 #include "JSSourceBufferList.cpp"
 #include "JSWebSocket.cpp"
 #include "JSWheelEvent.cpp"
 #include "JSWorker.cpp"
-#include "JSWorkerContext.cpp"
+#include "JSWorkerGlobalScope.cpp"
 #include "JSWorkerLocation.cpp"
 #include "JSWorkerNavigator.cpp"
 #include "JSXMLHttpRequest.cpp"
index 242d97b..ced3387 100644 (file)
@@ -91,7 +91,7 @@ BINDING_IDLS = \
     $(WebCore)/Modules/filesystem/FileWriterSync.idl \
     $(WebCore)/Modules/filesystem/Metadata.idl \
     $(WebCore)/Modules/filesystem/MetadataCallback.idl \
-    $(WebCore)/Modules/filesystem/WorkerContextFileSystem.idl \
+    $(WebCore)/Modules/filesystem/WorkerGlobalScopeFileSystem.idl \
     $(WebCore)/Modules/geolocation/Coordinates.idl \
     $(WebCore)/Modules/geolocation/Geolocation.idl \
     $(WebCore)/Modules/geolocation/Geoposition.idl \
@@ -110,7 +110,7 @@ BINDING_IDLS = \
     $(WebCore)/Modules/indexeddb/IDBRequest.idl \
     $(WebCore)/Modules/indexeddb/IDBTransaction.idl \
     $(WebCore)/Modules/indexeddb/IDBVersionChangeEvent.idl \
-    $(WebCore)/Modules/indexeddb/WorkerContextIndexedDatabase.idl \
+    $(WebCore)/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl \
     $(WebCore)/Modules/indieui/UIRequestEvent.idl \
     $(WebCore)/Modules/mediasource/MediaSource.idl \
     $(WebCore)/Modules/mediasource/SourceBuffer.idl \
@@ -119,7 +119,7 @@ BINDING_IDLS = \
     $(WebCore)/Modules/notifications/Notification.idl \
     $(WebCore)/Modules/notifications/NotificationCenter.idl \
     $(WebCore)/Modules/notifications/NotificationPermissionCallback.idl \
-    $(WebCore)/Modules/notifications/WorkerContextNotifications.idl \
+    $(WebCore)/Modules/notifications/WorkerGlobalScopeNotifications.idl \
     $(WebCore)/Modules/quota/DOMWindowQuota.idl \
     $(WebCore)/Modules/quota/NavigatorStorageQuota.idl \
     $(WebCore)/Modules/quota/StorageInfo.idl \
@@ -174,7 +174,7 @@ BINDING_IDLS = \
     $(WebCore)/Modules/webdatabase/SQLTransactionErrorCallback.idl \
     $(WebCore)/Modules/webdatabase/SQLTransactionSync.idl \
     $(WebCore)/Modules/webdatabase/SQLTransactionSyncCallback.idl \
-    $(WebCore)/Modules/webdatabase/WorkerContextWebDatabase.idl \
+    $(WebCore)/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl \
     $(WebCore)/Modules/websockets/CloseEvent.idl \
     $(WebCore)/Modules/websockets/WebSocket.idl \
     $(WebCore)/css/CSSCharsetRule.idl \
@@ -631,11 +631,11 @@ BINDING_IDLS = \
     $(WebCore)/testing/MemoryInfo.idl \
     $(WebCore)/testing/TypeConversions.idl \
     $(WebCore)/workers/AbstractWorker.idl \
-    $(WebCore)/workers/DedicatedWorkerContext.idl \
+    $(WebCore)/workers/DedicatedWorkerGlobalScope.idl \
     $(WebCore)/workers/SharedWorker.idl \
-    $(WebCore)/workers/SharedWorkerContext.idl \
+    $(WebCore)/workers/SharedWorkerGlobalScope.idl \
     $(WebCore)/workers/Worker.idl \
-    $(WebCore)/workers/WorkerContext.idl \
+    $(WebCore)/workers/WorkerGlobalScope.idl \
     $(WebCore)/workers/WorkerLocation.idl \
     $(WebCore)/xml/DOMParser.idl \
     $(WebCore)/xml/XMLHttpRequest.idl \
@@ -663,7 +663,7 @@ WEB_DOM_HEADERS :=
 all : \
     $(SUPPLEMENTAL_DEPENDENCY_FILE) \
     $(WINDOW_CONSTRUCTORS_FILE) \
-    $(WORKERCONTEXT_CONSTRUCTORS_FILE) \
+    $(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE) \
     $(JS_DOM_HEADERS) \
     $(WEB_DOM_HEADERS) \
     \
@@ -1009,7 +1009,7 @@ JS_BINDINGS_SCRIPTS = $(GENERATE_SCRIPTS) bindings/scripts/CodeGeneratorJS.pm
 SUPPLEMENTAL_DEPENDENCY_FILE = ./SupplementalDependencies.txt
 SUPPLEMENTAL_MAKEFILE_DEPS = ./SupplementalDependencies.dep
 WINDOW_CONSTRUCTORS_FILE = ./DOMWindowConstructors.idl
-WORKERCONTEXT_CONSTRUCTORS_FILE = ./WorkerContextConstructors.idl
+WORKERGLOBALSCOPE_CONSTRUCTORS_FILE = ./WorkerGlobalScopeConstructors.idl
 IDL_FILES_TMP = ./idl_files.tmp
 ADDITIONAL_IDLS = $(WebCore)/inspector/JavaScriptCallFrame.idl
 IDL_ATTRIBUTES_FILE = $(WebCore)/bindings/scripts/IDLAttributes.txt
@@ -1021,10 +1021,10 @@ space +=
 
 $(SUPPLEMENTAL_MAKEFILE_DEPS) : $(PREPROCESS_IDLS_SCRIPTS) $(BINDING_IDLS) $(ADDITIONAL_IDLS) $(PLATFORM_FEATURE_DEFINES)
        printf "$(subst $(space),,$(patsubst %,%\n,$(BINDING_IDLS) $(ADDITIONAL_IDLS)))" > $(IDL_FILES_TMP)
-       $(call preprocess_idls_script, $(PREPROCESS_IDLS_SCRIPTS)) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) --windowConstructorsFile $(WINDOW_CONSTRUCTORS_FILE) --workerContextConstructorsFile $(WORKERCONTEXT_CONSTRUCTORS_FILE) --supplementalMakefileDeps $@
+       $(call preprocess_idls_script, $(PREPROCESS_IDLS_SCRIPTS)) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) --windowConstructorsFile $(WINDOW_CONSTRUCTORS_FILE) --workerGlobalScopeConstructorsFile $(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --supplementalMakefileDeps $@
        rm -f $(IDL_FILES_TMP)
 
-JS%.h : %.idl $(JS_BINDINGS_SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(WINDOW_CONSTRUCTORS_FILE) $(WORKERCONTEXT_CONSTRUCTORS_FILE) $(PLATFORM_FEATURE_DEFINES)
+JS%.h : %.idl $(JS_BINDINGS_SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(WINDOW_CONSTRUCTORS_FILE) $(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE) $(PLATFORM_FEATURE_DEFINES)
        $(call generator_script, $(JS_BINDINGS_SCRIPTS)) $(IDL_COMMON_ARGS) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --idlAttributesFile $(IDL_ATTRIBUTES_FILE) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
 
 -include $(SUPPLEMENTAL_MAKEFILE_DEPS)
index ef8b23b..811b6a8 100644 (file)
@@ -112,7 +112,7 @@ IDL_BINDINGS += \
     $$PWD/Modules/filesystem/FileWriterCallback.idl \
     $$PWD/Modules/filesystem/Metadata.idl \
     $$PWD/Modules/filesystem/MetadataCallback.idl \
-    $$PWD/Modules/filesystem/WorkerContextFileSystem.idl \
+    $$PWD/Modules/filesystem/WorkerGlobalScopeFileSystem.idl \
     $$PWD/Modules/geolocation/Coordinates.idl \
     $$PWD/Modules/geolocation/Geolocation.idl \
     $$PWD/Modules/geolocation/Geoposition.idl \
@@ -130,12 +130,12 @@ IDL_BINDINGS += \
     $$PWD/Modules/indexeddb/IDBObjectStore.idl \
     $$PWD/Modules/indexeddb/IDBRequest.idl \
     $$PWD/Modules/indexeddb/IDBTransaction.idl \
-    $$PWD/Modules/indexeddb/WorkerContextIndexedDatabase.idl \
+    $$PWD/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl \
     $$PWD/Modules/notifications/DOMWindowNotifications.idl \
     $$PWD/Modules/notifications/Notification.idl \
     $$PWD/Modules/notifications/NotificationCenter.idl \
     $$PWD/Modules/notifications/NotificationPermissionCallback.idl \
-    $$PWD/Modules/notifications/WorkerContextNotifications.idl \
+    $$PWD/Modules/notifications/WorkerGlobalScopeNotifications.idl \
     $$PWD/Modules/quota/DOMWindowQuota.idl \
     $$PWD/Modules/quota/NavigatorStorageQuota.idl \
     $$PWD/Modules/quota/StorageInfo.idl \
@@ -185,7 +185,7 @@ IDL_BINDINGS += \
     $$PWD/Modules/webdatabase/SQLTransactionErrorCallback.idl \
     $$PWD/Modules/webdatabase/SQLTransactionSync.idl \
     $$PWD/Modules/webdatabase/SQLTransactionSyncCallback.idl \
-    $$PWD/Modules/webdatabase/WorkerContextWebDatabase.idl \
+    $$PWD/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl \
     $$PWD/Modules/websockets/CloseEvent.idl \
     $$PWD/Modules/websockets/WebSocket.idl \
     $$PWD/css/Counter.idl \
@@ -476,11 +476,11 @@ IDL_BINDINGS += \
     $$PWD/testing/MemoryInfo.idl \
     $$PWD/testing/TypeConversions.idl \
     $$PWD/workers/AbstractWorker.idl \
-    $$PWD/workers/DedicatedWorkerContext.idl \
+    $$PWD/workers/DedicatedWorkerGlobalScope.idl \
     $$PWD/workers/SharedWorker.idl \
-    $$PWD/workers/SharedWorkerContext.idl \
+    $$PWD/workers/SharedWorkerGlobalScope.idl \
     $$PWD/workers/Worker.idl \
-    $$PWD/workers/WorkerContext.idl \
+    $$PWD/workers/WorkerGlobalScope.idl \
     $$PWD/workers/WorkerLocation.idl \
     $$PWD/xml/DOMParser.idl \
     $$PWD/xml/XMLHttpRequest.idl \
@@ -734,7 +734,7 @@ IDL_BINDINGS += generated/$$INTERNAL_SETTINGS_GENERATED_IDL
 # GENERATOR 0: Resolve [Supplemental] dependency in IDLs
 SUPPLEMENTAL_DEPENDENCY_FILE = supplemental_dependency.tmp
 WINDOW_CONSTRUCTORS_FILE = DOMWindowConstructors.idl
-WORKERCONTEXT_CONSTRUCTORS_FILE = WorkerContextConstructors.idl
+WORKERGLOBALSCOPE_CONSTRUCTORS_FILE = WorkerGlobalScopeConstructors.idl
 IDL_FILES_TMP = ${QMAKE_FUNC_FILE_OUT_PATH}/idl_files.tmp
 PREPROCESS_IDLS_SCRIPT = $$PWD/bindings/scripts/preprocess-idls.pl
 IDL_ATTRIBUTES_FILE = $$PWD/bindings/scripts/IDLAttributes.txt
@@ -754,8 +754,8 @@ preprocessIdls.commands += perl -I$$PWD/bindings/scripts $$preprocessIdls.script
                                --idlFilesList $$IDL_FILES_TMP \
                                --supplementalDependencyFile ${QMAKE_FUNC_FILE_OUT_PATH}/$$SUPPLEMENTAL_DEPENDENCY_FILE \
                                --windowConstructorsFile ${QMAKE_FUNC_FILE_OUT_PATH}/$$WINDOW_CONSTRUCTORS_FILE \
-                               --workerContextConstructorsFile ${QMAKE_FUNC_FILE_OUT_PATH}/$$WORKERCONTEXT_CONSTRUCTORS_FILE
-preprocessIdls.output = $$SUPPLEMENTAL_DEPENDENCY_FILE $$WINDOW_CONSTRUCTORS_FILE $$WORKERCONTEXT_CONSTRUCTORS_FILE
+                               --workerGlobalScopeConstructorsFile ${QMAKE_FUNC_FILE_OUT_PATH}/$$WORKERGLOBALSCOPE_CONSTRUCTORS_FILE
+preprocessIdls.output = $$SUPPLEMENTAL_DEPENDENCY_FILE $$WINDOW_CONSTRUCTORS_FILE $$WORKERGLOBALSCOPE_CONSTRUCTORS_FILE
 preprocessIdls.add_output_to_sources = false
 preprocessIdls.depends = $$IDL_BINDINGS
 GENERATORS += preprocessIdls
index 2fb8816..ea49d70 100644 (file)
@@ -404,7 +404,7 @@ vpath %.idl $(IDL_PATH)
 
 supplemental_dependency_file = $(top_builddir)/DerivedSources/WebCore/idl_supplemental_dependencies
 window_constructors_file = $(top_builddir)/DerivedSources/WebCore/DOMWindowConstructors.idl
-workercontext_constructors_file = $(top_builddir)/DerivedSources/WebCore/WorkerContextConstructors.idl
+workerglobalscope_constructors_file = $(top_builddir)/DerivedSources/WebCore/WorkerGlobalScopeConstructors.idl
 idl_files_list = $(top_builddir)/DerivedSources/WebCore/idl_files_list
 idl_attributes_file = $(WebCore)/bindings/scripts/IDLAttributes.txt
 
@@ -413,9 +413,9 @@ $(supplemental_dependency_file): $(SCRIPTS_FOR_PREPROCESS_IDLS) $(dom_binding_id
        $(AM_V_GEN)
        $(AM_V_at)echo -n > $(idl_files_list)
        $(AM_V_at)($(foreach idl, $(dom_binding_idls), echo $(idl) &&) echo -n) >> $(idl_files_list)
-       $(AM_V_at)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/preprocess-idls.pl --defines "LANGUAGE_JAVASCRIPT=1 $(feature_defines)" --idlFilesList $(idl_files_list) --windowConstructorsFile $(window_constructors_file) --workerContextConstructorsFile $(workercontext_constructors_file) --supplementalDependencyFile $@
+       $(AM_V_at)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/preprocess-idls.pl --defines "LANGUAGE_JAVASCRIPT=1 $(feature_defines)" --idlFilesList $(idl_files_list) --windowConstructorsFile $(window_constructors_file) --workerGlobalScopeConstructorsFile $(workerglobalscope_constructors_file) --supplementalDependencyFile $@
 
-.PHONY: $(window_constructors_file) $(workercontext_constructors_file)
+.PHONY: $(window_constructors_file) $(workerglobalscope_constructors_file)
 
 # This does not appear to work correctly with gnumake unless
 # it includes an empty command list (the semicolon).
@@ -435,7 +435,7 @@ DerivedSources/WebCore/JSInternalSettingsGenerated.h: DerivedSources/WebCore/Int
 # IDL generation takes a long time. The pipe represents an order-only dependency,
 # which means that GNUmake will only try to build the dependencies first, but
 # not rebuild all the targets if the dependencies change.
-$(webkitgtk_sources) $(webkit2_sources) $(webkit2_plugin_process_sources) $(webcore_sources) $(webcoregtk_sources) $(platform_sources) $(platformgtk_sources) : | $(supplemental_dependency_file) $(window_constructors_file) $(workercontext_constructors_file) $(webcore_built_sources) $(platform_built_sources)
+$(webkitgtk_sources) $(webkit2_sources) $(webkit2_plugin_process_sources) $(webcore_sources) $(webcoregtk_sources) $(platform_sources) $(platformgtk_sources) : | $(supplemental_dependency_file) $(window_constructors_file) $(workerglobalscope_constructors_file) $(webcore_built_sources) $(platform_built_sources)
 
 noinst_LTLIBRARIES += \
        libWebCorePlatform.la \
index 3d25dcf..79a405b 100644 (file)
@@ -158,8 +158,8 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSDataTransferItemList.h \
        DerivedSources/WebCore/JSDataView.cpp \
        DerivedSources/WebCore/JSDataView.h \
-       DerivedSources/WebCore/JSDedicatedWorkerContext.cpp \
-       DerivedSources/WebCore/JSDedicatedWorkerContext.h \
+       DerivedSources/WebCore/JSDedicatedWorkerGlobalScope.cpp \
+       DerivedSources/WebCore/JSDedicatedWorkerGlobalScope.h \
        DerivedSources/WebCore/JSDelayNode.cpp \
        DerivedSources/WebCore/JSDelayNode.h \
        DerivedSources/WebCore/JSDeviceMotionEvent.cpp \
@@ -676,8 +676,8 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSSecurityPolicyViolationEvent.h \
        DerivedSources/WebCore/JSShadowRoot.cpp \
        DerivedSources/WebCore/JSShadowRoot.h \
-       DerivedSources/WebCore/JSSharedWorkerContext.cpp \
-       DerivedSources/WebCore/JSSharedWorkerContext.h \
+       DerivedSources/WebCore/JSSharedWorkerGlobalScope.cpp \
+       DerivedSources/WebCore/JSSharedWorkerGlobalScope.h \
        DerivedSources/WebCore/JSSharedWorker.cpp \
        DerivedSources/WebCore/JSSharedWorker.h \
        DerivedSources/WebCore/JSSourceBuffer.cpp \
@@ -854,8 +854,8 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSWebSocket.h \
        DerivedSources/WebCore/JSWheelEvent.cpp \
        DerivedSources/WebCore/JSWheelEvent.h \
-       DerivedSources/WebCore/JSWorkerContext.cpp \
-       DerivedSources/WebCore/JSWorkerContext.h \
+       DerivedSources/WebCore/JSWorkerGlobalScope.cpp \
+       DerivedSources/WebCore/JSWorkerGlobalScope.h \
        DerivedSources/WebCore/JSWorker.cpp \
        DerivedSources/WebCore/JSWorker.h \
        DerivedSources/WebCore/JSWorkerLocation.cpp \
@@ -1239,7 +1239,7 @@ dom_binding_idls += \
        $(WebCore)/Modules/filesystem/FileWriterSync.idl \
        $(WebCore)/Modules/filesystem/Metadata.idl \
        $(WebCore)/Modules/filesystem/MetadataCallback.idl \
-       $(WebCore)/Modules/filesystem/WorkerContextFileSystem.idl \
+       $(WebCore)/Modules/filesystem/WorkerGlobalScopeFileSystem.idl \
        $(WebCore)/Modules/gamepad/Gamepad.idl \
        $(WebCore)/Modules/gamepad/GamepadList.idl \
        $(WebCore)/Modules/gamepad/NavigatorGamepad.idl \
@@ -1263,7 +1263,7 @@ dom_binding_idls += \
        $(WebCore)/Modules/indexeddb/IDBRequest.idl \
        $(WebCore)/Modules/indexeddb/IDBTransaction.idl \
        $(WebCore)/Modules/indexeddb/IDBVersionChangeEvent.idl \
-       $(WebCore)/Modules/indexeddb/WorkerContextIndexedDatabase.idl \
+       $(WebCore)/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl \
        $(WebCore)/Modules/mediasource/MediaSource.idl \
        $(WebCore)/Modules/mediasource/SourceBuffer.idl \
        $(WebCore)/Modules/mediasource/SourceBufferList.idl \
@@ -1294,7 +1294,7 @@ dom_binding_idls += \
        $(WebCore)/Modules/notifications/Notification.idl \
        $(WebCore)/Modules/notifications/NotificationCenter.idl \
        $(WebCore)/Modules/notifications/NotificationPermissionCallback.idl \
-       $(WebCore)/Modules/notifications/WorkerContextNotifications.idl \
+       $(WebCore)/Modules/notifications/WorkerGlobalScopeNotifications.idl \
        $(WebCore)/Modules/proximity/DeviceProximityEvent.idl \
        $(WebCore)/Modules/quota/DOMWindowQuota.idl \
        $(WebCore)/Modules/quota/NavigatorStorageQuota.idl \
@@ -1345,7 +1345,7 @@ dom_binding_idls += \
        $(WebCore)/Modules/webdatabase/SQLTransactionErrorCallback.idl \
        $(WebCore)/Modules/webdatabase/SQLTransactionSync.idl \
        $(WebCore)/Modules/webdatabase/SQLTransactionSyncCallback.idl \
-       $(WebCore)/Modules/webdatabase/WorkerContextWebDatabase.idl \
+       $(WebCore)/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl \
        $(WebCore)/Modules/websockets/CloseEvent.idl \
        $(WebCore)/Modules/websockets/WebSocket.idl \
        $(WebCore)/css/CSSCharsetRule.idl \
@@ -1795,11 +1795,11 @@ dom_binding_idls += \
        $(WebCore)/testing/MemoryInfo.idl \
        $(WebCore)/testing/TypeConversions.idl \
        $(WebCore)/workers/AbstractWorker.idl \
-       $(WebCore)/workers/DedicatedWorkerContext.idl \
+       $(WebCore)/workers/DedicatedWorkerGlobalScope.idl \
        $(WebCore)/workers/SharedWorker.idl \
-       $(WebCore)/workers/SharedWorkerContext.idl \
+       $(WebCore)/workers/SharedWorkerGlobalScope.idl \
        $(WebCore)/workers/Worker.idl \
-       $(WebCore)/workers/WorkerContext.idl \
+       $(WebCore)/workers/WorkerGlobalScope.idl \
        $(WebCore)/workers/WorkerLocation.idl \
        $(WebCore)/xml/DOMParser.idl \
        $(WebCore)/xml/XMLHttpRequest.idl \
@@ -1879,8 +1879,8 @@ webcore_modules_sources += \
        Source/WebCore/Modules/filesystem/LocalFileSystem.h \
        Source/WebCore/Modules/filesystem/MetadataCallback.h \
        Source/WebCore/Modules/filesystem/Metadata.h \
-       Source/WebCore/Modules/filesystem/WorkerContextFileSystem.cpp \
-       Source/WebCore/Modules/filesystem/WorkerContextFileSystem.h \
+       Source/WebCore/Modules/filesystem/WorkerGlobalScopeFileSystem.cpp \
+       Source/WebCore/Modules/filesystem/WorkerGlobalScopeFileSystem.h \
        Source/WebCore/Modules/gamepad/Gamepad.cpp \
        Source/WebCore/Modules/gamepad/Gamepad.h \
        Source/WebCore/Modules/gamepad/GamepadList.cpp \
@@ -1970,8 +1970,8 @@ webcore_modules_sources += \
        Source/WebCore/Modules/indexeddb/IndexedDB.h \
        Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp \
        Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.h \
-       Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.cpp \
-       Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.h \
+       Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp \
+       Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h \
        Source/WebCore/Modules/mediasource/MediaSource.cpp \
        Source/WebCore/Modules/mediasource/MediaSource.h \
        Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp \
@@ -2046,8 +2046,8 @@ webcore_modules_sources += \
        Source/WebCore/Modules/notifications/Notification.cpp \
        Source/WebCore/Modules/notifications/Notification.h \
        Source/WebCore/Modules/notifications/NotificationPermissionCallback.h \
-       Source/WebCore/Modules/notifications/WorkerContextNotifications.cpp \
-       Source/WebCore/Modules/notifications/WorkerContextNotifications.h \
+       Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.cpp \
+       Source/WebCore/Modules/notifications/WorkerGlobalScopeNotifications.h \
        Source/WebCore/Modules/proximity/DeviceProximityClient.h \
        Source/WebCore/Modules/proximity/DeviceProximityController.cpp \
        Source/WebCore/Modules/proximity/DeviceProximityController.h \
@@ -2231,8 +2231,8 @@ webcore_modules_sources += \
        Source/WebCore/Modules/webdatabase/SQLTransactionStateMachine.h \
        Source/WebCore/Modules/webdatabase/SQLTransactionSync.cpp \
        Source/WebCore/Modules/webdatabase/SQLTransactionSync.h \
-       Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.cpp \
-       Source/WebCore/Modules/webdatabase/WorkerContextWebDatabase.h \
+       Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp \
+       Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h \
        Source/WebCore/Modules/websockets/CloseEvent.h \
        Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp \
        Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h \
@@ -2392,7 +2392,7 @@ webcore_sources += \
        Source/WebCore/bindings/js/JSDOMWrapper.cpp \
        Source/WebCore/bindings/js/JSDOMWrapper.h \
        Source/WebCore/bindings/js/JSDataViewCustom.cpp \
-       Source/WebCore/bindings/js/JSDedicatedWorkerContextCustom.cpp \
+       Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp \
        Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp \
        Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp \
        Source/WebCore/bindings/js/JSDocumentCustom.cpp \
@@ -2497,9 +2497,9 @@ webcore_sources += \
        Source/WebCore/bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp \
        Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp \
        Source/WebCore/bindings/js/JSWebKitPointCustom.cpp \
-       Source/WebCore/bindings/js/JSWorkerContextBase.cpp \
-       Source/WebCore/bindings/js/JSWorkerContextBase.h \
-       Source/WebCore/bindings/js/JSWorkerContextCustom.cpp \
+       Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp \
+       Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h \
+       Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp \
        Source/WebCore/bindings/js/JSWorkerCustom.cpp \
        Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp \
        Source/WebCore/bindings/js/JSXMLHttpRequestUploadCustom.cpp \
@@ -4731,14 +4731,14 @@ webcore_sources += \
        Source/WebCore/WebCorePrefix.h \
        Source/WebCore/workers/AbstractWorker.cpp \
        Source/WebCore/workers/AbstractWorker.h \
-       Source/WebCore/workers/DedicatedWorkerContext.cpp \
-       Source/WebCore/workers/DedicatedWorkerContext.h \
+       Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp \
+       Source/WebCore/workers/DedicatedWorkerGlobalScope.h \
        Source/WebCore/workers/DedicatedWorkerThread.cpp \
        Source/WebCore/workers/DedicatedWorkerThread.h \
        Source/WebCore/workers/DefaultSharedWorkerRepository.cpp \
        Source/WebCore/workers/DefaultSharedWorkerRepository.h \
-       Source/WebCore/workers/SharedWorkerContext.cpp \
-       Source/WebCore/workers/SharedWorkerContext.h \
+       Source/WebCore/workers/SharedWorkerGlobalScope.cpp \
+       Source/WebCore/workers/SharedWorkerGlobalScope.h \
        Source/WebCore/workers/SharedWorker.cpp \
        Source/WebCore/workers/SharedWorker.h \
        Source/WebCore/workers/SharedWorkerRepository.cpp \
@@ -4746,9 +4746,9 @@ webcore_sources += \
        Source/WebCore/workers/SharedWorkerStrategy.h \
        Source/WebCore/workers/SharedWorkerThread.cpp \
        Source/WebCore/workers/SharedWorkerThread.h \
-       Source/WebCore/workers/WorkerContext.cpp \
-       Source/WebCore/workers/WorkerContext.h \
-       Source/WebCore/workers/WorkerContextProxy.h \
+       Source/WebCore/workers/WorkerGlobalScope.cpp \
+       Source/WebCore/workers/WorkerGlobalScope.h \
+       Source/WebCore/workers/WorkerGlobalScopeProxy.h \
        Source/WebCore/workers/WorkerEventQueue.cpp \
        Source/WebCore/workers/WorkerEventQueue.h \
        Source/WebCore/workers/Worker.cpp \
@@ -26,7 +26,7 @@
  */
 
 #include "config.h"
-#include "WorkerContextFileSystem.h"
+#include "WorkerGlobalScopeFileSystem.h"
 
 #if ENABLE(FILE_SYSTEM)
 
 #include "LocalFileSystem.h"
 #include "SecurityOrigin.h"
 #include "SyncCallbackHelper.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 
 namespace WebCore {
 
-void WorkerContextFileSystem::webkitRequestFileSystem(WorkerContext* worker, int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
+void WorkerGlobalScopeFileSystem::webkitRequestFileSystem(WorkerGlobalScope* worker, int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
 {
     ScriptExecutionContext* secureContext = worker->scriptExecutionContext();
     if (!AsyncFileSystem::isAvailable() || !secureContext->securityOrigin()->canAccessFileSystem()) {
@@ -65,7 +65,7 @@ void WorkerContextFileSystem::webkitRequestFileSystem(WorkerContext* worker, int
     LocalFileSystem::localFileSystem().requestFileSystem(worker, fileSystemType, size, FileSystemCallbacks::create(successCallback, errorCallback, worker, fileSystemType), AsynchronousFileSystem);
 }
 
-PassRefPtr<DOMFileSystemSync> WorkerContextFileSystem::webkitRequestFileSystemSync(WorkerContext* worker, int type, long long size, ExceptionCode& ec)
+PassRefPtr<DOMFileSystemSync> WorkerGlobalScopeFileSystem::webkitRequestFileSystemSync(WorkerGlobalScope* worker, int type, long long size, ExceptionCode& ec)
 {
     ec = 0;
     ScriptExecutionContext* secureContext = worker->scriptExecutionContext();
@@ -85,7 +85,7 @@ PassRefPtr<DOMFileSystemSync> WorkerContextFileSystem::webkitRequestFileSystemSy
     return helper.getResult(ec);
 }
 
-void WorkerContextFileSystem::webkitResolveLocalFileSystemURL(WorkerContext* worker, const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
+void WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemURL(WorkerGlobalScope* worker, const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
 {
     KURL completedURL = worker->completeURL(url);
     ScriptExecutionContext* secureContext = worker->scriptExecutionContext();
@@ -104,7 +104,7 @@ void WorkerContextFileSystem::webkitResolveLocalFileSystemURL(WorkerContext* wor
     LocalFileSystem::localFileSystem().readFileSystem(worker, type, ResolveURICallbacks::create(successCallback, errorCallback, worker, type, filePath));
 }
 
-PassRefPtr<EntrySync> WorkerContextFileSystem::webkitResolveLocalFileSystemSyncURL(WorkerContext* worker, const String& url, ExceptionCode& ec)
+PassRefPtr<EntrySync> WorkerGlobalScopeFileSystem::webkitResolveLocalFileSystemSyncURL(WorkerGlobalScope* worker, const String& url, ExceptionCode& ec)
 {
     ec = 0;
     KURL completedURL = worker->completeURL(url);
@@ -134,8 +134,8 @@ PassRefPtr<EntrySync> WorkerContextFileSystem::webkitResolveLocalFileSystemSyncU
     return entry.release();
 }
 
-COMPILE_ASSERT(static_cast<int>(WorkerContextFileSystem::TEMPORARY) == static_cast<int>(FileSystemTypeTemporary), enum_mismatch);
-COMPILE_ASSERT(static_cast<int>(WorkerContextFileSystem::PERSISTENT) == static_cast<int>(FileSystemTypePersistent), enum_mismatch);
+COMPILE_ASSERT(static_cast<int>(WorkerGlobalScopeFileSystem::TEMPORARY) == static_cast<int>(FileSystemTypeTemporary), enum_mismatch);
+COMPILE_ASSERT(static_cast<int>(WorkerGlobalScopeFileSystem::PERSISTENT) == static_cast<int>(FileSystemTypePersistent), enum_mismatch);
 
 } // namespace WebCore
 
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef WorkerContextFileSystem_h
-#define WorkerContextFileSystem_h
+#ifndef WorkerGlobalScopeFileSystem_h
+#define WorkerGlobalScopeFileSystem_h
 
 #if ENABLE(FILE_SYSTEM)
 
@@ -38,27 +38,27 @@ class EntryCallback;
 class EntrySync;
 class ErrorCallback;
 class FileSystemCallback;
-class WorkerContext;
+class WorkerGlobalScope;
 
-class WorkerContextFileSystem {
+class WorkerGlobalScopeFileSystem {
 public:
     enum {
         TEMPORARY,
         PERSISTENT,
     };
 
-    static void webkitRequestFileSystem(WorkerContext*, int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback>);
-    static PassRefPtr<DOMFileSystemSync> webkitRequestFileSystemSync(WorkerContext*, int type, long long size, ExceptionCode&);
-    static void webkitResolveLocalFileSystemURL(WorkerContext*, const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback>);
-    static PassRefPtr<EntrySync> webkitResolveLocalFileSystemSyncURL(WorkerContext*, const String& url, ExceptionCode&);
+    static void webkitRequestFileSystem(WorkerGlobalScope*, int type, long long size, PassRefPtr<FileSystemCallback> successCallback, PassRefPtr<ErrorCallback>);
+    static PassRefPtr<DOMFileSystemSync> webkitRequestFileSystemSync(WorkerGlobalScope*, int type, long long size, ExceptionCode&);
+    static void webkitResolveLocalFileSystemURL(WorkerGlobalScope*, const String& url, PassRefPtr<EntryCallback> successCallback, PassRefPtr<ErrorCallback>);
+    static PassRefPtr<EntrySync> webkitResolveLocalFileSystemSyncURL(WorkerGlobalScope*, const String& url, ExceptionCode&);
 
 private:
-    WorkerContextFileSystem();
-    ~WorkerContextFileSystem();    
+    WorkerGlobalScopeFileSystem();
+    ~WorkerGlobalScopeFileSystem();
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(FILE_SYSTEM)
 
-#endif // WorkerContextFileSystem_h
+#endif // WorkerGlobalScopeFileSystem_h
@@ -26,7 +26,7 @@
 
 [
     Conditional=FILE_SYSTEM,
-] partial interface WorkerContext {
+] partial interface WorkerGlobalScope {
     const unsigned short TEMPORARY = 0;
     const unsigned short PERSISTENT = 1;
 
index fb90541..8d98d22 100644 (file)
@@ -49,7 +49,7 @@
 #include "Page.h"
 #include "PageGroup.h"
 #include "SecurityOrigin.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerLoaderProxy.h"
 #include "WorkerThread.h"
 
@@ -69,13 +69,13 @@ IDBFactory::~IDBFactory()
 namespace {
 static bool isContextValid(ScriptExecutionContext* context)
 {
-    ASSERT(context->isDocument() || context->isWorkerContext());
+    ASSERT(context->isDocument() || context->isWorkerGlobalScope());
     if (context->isDocument()) {
         Document* document = toDocument(context);
         return document->frame() && document->page();
     }
 #if !ENABLE(WORKERS)
-    if (context->isWorkerContext())
+    if (context->isWorkerGlobalScope())
         return false;
 #endif
     return true;
@@ -89,8 +89,8 @@ static String getIndexedDBDatabasePath(ScriptExecutionContext* context)
         return document->page()->group().groupSettings()->indexedDBDatabasePath();
     }
 #if ENABLE(WORKERS)
-    WorkerContext* workerContext = static_cast<WorkerContext*>(context);
-    const GroupSettings* groupSettings = workerContext->groupSettings();
+    WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context);
+    const GroupSettings* groupSettings = workerGlobalScope->groupSettings();
     if (groupSettings)
         return groupSettings->indexedDBDatabasePath();
 #endif
@@ -29,7 +29,7 @@
 
 #if ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE)
 
-#include "WorkerContextIndexedDatabase.h"
+#include "WorkerGlobalScopeIndexedDatabase.h"
 
 #include "IDBFactory.h"
 #include "IDBFactoryBackendInterface.h"
 
 namespace WebCore {
 
-WorkerContextIndexedDatabase::WorkerContextIndexedDatabase()
+WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase()
 {
 }
 
-WorkerContextIndexedDatabase::~WorkerContextIndexedDatabase()
+WorkerGlobalScopeIndexedDatabase::~WorkerGlobalScopeIndexedDatabase()
 {
 }
 
-const char* WorkerContextIndexedDatabase::supplementName()
+const char* WorkerGlobalScopeIndexedDatabase::supplementName()
 {
-    return "WorkerContextIndexedDatabase";
+    return "WorkerGlobalScopeIndexedDatabase";
 }
 
-WorkerContextIndexedDatabase* WorkerContextIndexedDatabase::from(ScriptExecutionContext* context)
+WorkerGlobalScopeIndexedDatabase* WorkerGlobalScopeIndexedDatabase::from(ScriptExecutionContext* context)
 {
-    WorkerContextIndexedDatabase* supplement = static_cast<WorkerContextIndexedDatabase*>(Supplement<ScriptExecutionContext>::from(context, supplementName()));
+    WorkerGlobalScopeIndexedDatabase* supplement = static_cast<WorkerGlobalScopeIndexedDatabase*>(Supplement<ScriptExecutionContext>::from(context, supplementName()));
     if (!supplement) {
-        supplement = new WorkerContextIndexedDatabase();
+        supplement = new WorkerGlobalScopeIndexedDatabase();
         provideTo(context, supplementName(), adoptPtr(supplement));
     }
     return supplement;
 }
 
-IDBFactory* WorkerContextIndexedDatabase::indexedDB(ScriptExecutionContext* context)
+IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB(ScriptExecutionContext* context)
 {
     return from(context)->indexedDB();
 }
 
-IDBFactory* WorkerContextIndexedDatabase::indexedDB()
+IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB()
 {
     if (!m_factoryBackend)
         m_factoryBackend = IDBFactoryBackendInterface::create();
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef WorkerContextIndexedDatabase_h
-#define WorkerContextIndexedDatabase_h
+#ifndef WorkerGlobalScopeIndexedDatabase_h
+#define WorkerGlobalScopeIndexedDatabase_h
 
 #if ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE)
 
@@ -37,15 +37,15 @@ class IDBFactory;
 class IDBFactoryBackendInterface;
 class ScriptExecutionContext;
 
-class WorkerContextIndexedDatabase : public Supplement<ScriptExecutionContext> {
+class WorkerGlobalScopeIndexedDatabase : public Supplement<ScriptExecutionContext> {
 public:
-    virtual ~WorkerContextIndexedDatabase();
-    static WorkerContextIndexedDatabase* from(ScriptExecutionContext*);
+    virtual ~WorkerGlobalScopeIndexedDatabase();
+    static WorkerGlobalScopeIndexedDatabase* from(ScriptExecutionContext*);
 
     static IDBFactory* indexedDB(ScriptExecutionContext*);
 
 private:
-    WorkerContextIndexedDatabase();
+    WorkerGlobalScopeIndexedDatabase();
 
     IDBFactory* indexedDB();
     static const char* supplementName();
@@ -58,4 +58,4 @@ private:
 
 #endif // ENABLE(WORKERS) && ENABLE(INDEXED_DATABASE)
 
-#endif // WorkerContextIndexedDatabase_h
+#endif // WorkerGlobalScopeIndexedDatabase_h
@@ -26,7 +26,7 @@
 
 [
     Conditional=INDEXED_DATABASE,
-] partial interface WorkerContext {
+] partial interface WorkerGlobalScope {
     [ImplementedAs=indexedDB] readonly attribute IDBFactory webkitIndexedDB;
 
     attribute IDBCursorConstructor webkitIDBCursor;
index 481184f..c38ba7b 100644 (file)
@@ -49,7 +49,7 @@
 #include "ResourceResponse.h"
 #include "ThreadableLoader.h"
 #include "WindowFocusAllowedIndicator.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 
 namespace WebCore {
 
index f11a2c9..8ca115b 100644 (file)
@@ -38,7 +38,7 @@
 #include "Document.h"
 #include "NotificationClient.h"
 #include "SecurityOrigin.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 
 namespace WebCore {
 
  */
 
 #include "config.h"
-#include "WorkerContextNotifications.h"
+#include "WorkerGlobalScopeNotifications.h"
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
 
 #include "NotificationCenter.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerThread.h"
 
 namespace WebCore {
 
-WorkerContextNotifications::WorkerContextNotifications(WorkerContext* context)
+WorkerGlobalScopeNotifications::WorkerGlobalScopeNotifications(WorkerGlobalScope* context)
     : m_context(context)
 {
 }
 
-WorkerContextNotifications::~WorkerContextNotifications()
+WorkerGlobalScopeNotifications::~WorkerGlobalScopeNotifications()
 {
 }
 
-const char* WorkerContextNotifications::supplementName()
+const char* WorkerGlobalScopeNotifications::supplementName()
 {
-    return "WorkerContextNotifications";
+    return "WorkerGlobalScopeNotifications";
 }
 
-WorkerContextNotifications* WorkerContextNotifications::from(WorkerContext* context)
+WorkerGlobalScopeNotifications* WorkerGlobalScopeNotifications::from(WorkerGlobalScope* context)
 {
-    WorkerContextNotifications* supplement = static_cast<WorkerContextNotifications*>(Supplement<ScriptExecutionContext>::from(context, supplementName()));
+    WorkerGlobalScopeNotifications* supplement = static_cast<WorkerGlobalScopeNotifications*>(Supplement<ScriptExecutionContext>::from(context, supplementName()));
     if (!supplement) {
-        supplement = new WorkerContextNotifications(context);
+        supplement = new WorkerGlobalScopeNotifications(context);
         Supplement<ScriptExecutionContext>::provideTo(context, supplementName(), adoptPtr(supplement));
     }
     return supplement;
 }
 
-NotificationCenter* WorkerContextNotifications::webkitNotifications(WorkerContext* context)
+NotificationCenter* WorkerGlobalScopeNotifications::webkitNotifications(WorkerGlobalScope* context)
 {
-    return WorkerContextNotifications::from(context)->webkitNotifications();
+    return WorkerGlobalScopeNotifications::from(context)->webkitNotifications();
 }
 
-NotificationCenter* WorkerContextNotifications::webkitNotifications()
+NotificationCenter* WorkerGlobalScopeNotifications::webkitNotifications()
 {
     if (!m_notificationCenter)
         m_notificationCenter = NotificationCenter::create(m_context, m_context->thread()->getNotificationClient());
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef WorkerContextNotifications_h
-#define WorkerContextNotifications_h
+#ifndef WorkerGlobalScopeNotifications_h
+#define WorkerGlobalScopeNotifications_h
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
 
@@ -35,22 +35,22 @@ namespace WebCore {
 
 class NotificationCenter;
 class ScriptExecutionContext;
-class WorkerContext;
+class WorkerGlobalScope;
 
-class WorkerContextNotifications : public Supplement<ScriptExecutionContext> {
+class WorkerGlobalScopeNotifications : public Supplement<ScriptExecutionContext> {
 public:
-    virtual ~WorkerContextNotifications();
+    virtual ~WorkerGlobalScopeNotifications();
 
-    static NotificationCenter* webkitNotifications(WorkerContext*);
-    static WorkerContextNotifications* from(WorkerContext*);
+    static NotificationCenter* webkitNotifications(WorkerGlobalScope*);
+    static WorkerGlobalScopeNotifications* from(WorkerGlobalScope*);
 
 private:
-    explicit WorkerContextNotifications(WorkerContext*);
+    explicit WorkerGlobalScopeNotifications(WorkerGlobalScope*);
 
     NotificationCenter* webkitNotifications();
     static const char* supplementName();
 
-    WorkerContext* m_context;
+    WorkerGlobalScope* m_context;
     RefPtr<NotificationCenter> m_notificationCenter;
 };
 
@@ -58,4 +58,4 @@ private:
 
 #endif // ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
 
-#endif // WorkerContextNotifications_h
+#endif // WorkerGlobalScopeNotifications_h
@@ -26,7 +26,7 @@
 
 [
     Conditional=NOTIFICATIONS|LEGACY_NOTIFICATIONS,
-] partial interface WorkerContext {
+] partial interface WorkerGlobalScope {
 #if defined(ENABLE_LEGACY_NOTIFICATIONS) && ENABLE_LEGACY_NOTIFICATIONS
     readonly attribute NotificationCenter webkitNotifications;
 #endif
index 2b03470..12f7fd6 100644 (file)
@@ -210,7 +210,7 @@ bool DatabaseContext::allowDatabaseAccess() const
             return false;
         return true;
     }
-    ASSERT(m_scriptExecutionContext->isWorkerContext());
+    ASSERT(m_scriptExecutionContext->isWorkerGlobalScope());
     // allowDatabaseAccess is not yet implemented for workers.
     return true;
 }
@@ -223,7 +223,7 @@ void DatabaseContext::databaseExceededQuota(const String& name, DatabaseDetails
             page->chrome().client()->exceededDatabaseQuota(document->frame(), name, details);
         return;
     }
-    ASSERT(m_scriptExecutionContext->isWorkerContext());
+    ASSERT(m_scriptExecutionContext->isWorkerGlobalScope());
     // FIXME: This needs a real implementation; this is a temporary solution for testing.
     const unsigned long long defaultQuota = 5 * 1024 * 1024;
     DatabaseManager::manager().setQuota(m_scriptExecutionContext->securityOrigin(), defaultQuota);
 
 #if ENABLE(SQL_DATABASE)
 
-#include "WorkerContextWebDatabase.h"
+#include "WorkerGlobalScopeWebDatabase.h"
 
 #include "Database.h"
 #include "DatabaseCallback.h"
 #include "DatabaseManager.h"
 #include "DatabaseSync.h"
 #include "SecurityOrigin.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 
 namespace WebCore {
 
-PassRefPtr<Database> WorkerContextWebDatabase::openDatabase(WorkerContext* context, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
+PassRefPtr<Database> WorkerGlobalScopeWebDatabase::openDatabase(WorkerGlobalScope* context, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
 {
     DatabaseManager& dbManager = DatabaseManager::manager();
     RefPtr<Database> database;
@@ -55,7 +55,7 @@ PassRefPtr<Database> WorkerContextWebDatabase::openDatabase(WorkerContext* conte
     return database.release();
 }
 
-PassRefPtr<DatabaseSync> WorkerContextWebDatabase::openDatabaseSync(WorkerContext* context, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
+PassRefPtr<DatabaseSync> WorkerGlobalScopeWebDatabase::openDatabaseSync(WorkerGlobalScope* context, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
 {
     DatabaseManager& dbManager = DatabaseManager::manager();
     RefPtr<DatabaseSync> database;
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef WorkerContextWebDatabase_h
-#define WorkerContextWebDatabase_h
+#ifndef WorkerGlobalScopeWebDatabase_h
+#define WorkerGlobalScopeWebDatabase_h
 
 #if ENABLE(SQL_DATABASE)
 
@@ -40,20 +40,20 @@ namespace WebCore {
 class Database;
 class DatabaseCallback;
 class DatabaseSync;
-class WorkerContext;
+class WorkerGlobalScope;
 
-class WorkerContextWebDatabase {
+class WorkerGlobalScopeWebDatabase {
 public:
-    static PassRefPtr<Database> openDatabase(WorkerContext*, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
-    static PassRefPtr<DatabaseSync> openDatabaseSync(WorkerContext*, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
+    static PassRefPtr<Database> openDatabase(WorkerGlobalScope*, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
+    static PassRefPtr<DatabaseSync> openDatabaseSync(WorkerGlobalScope*, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
 
 private:
-    WorkerContextWebDatabase() { };
-    ~WorkerContextWebDatabase() { };
+    WorkerGlobalScopeWebDatabase() { };
+    ~WorkerGlobalScopeWebDatabase() { };
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(SQL_DATABASE)
 
-#endif // WorkerContextWebDatabase_h
+#endif // WorkerGlobalScopeWebDatabase_h
@@ -26,7 +26,7 @@
 
 [
     Conditional=SQL_DATABASE,
-] partial interface WorkerContext {
+] partial interface WorkerGlobalScope {
     [RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
 
     [RaisesException] DatabaseSync openDatabaseSync(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
index 9e51849..de821d2 100644 (file)
@@ -39,7 +39,7 @@
 #include "ThreadableWebSocketChannelClientWrapper.h"
 #include "WebSocketChannel.h"
 #include "WebSocketChannelClient.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerRunLoop.h"
 #include "WorkerThread.h"
 #include "WorkerThreadableWebSocketChannel.h"
@@ -56,12 +56,12 @@ PassRefPtr<ThreadableWebSocketChannel> ThreadableWebSocketChannel::create(Script
     ASSERT(client);
 
 #if ENABLE(WORKERS)
-    if (context->isWorkerContext()) {
-        WorkerContext* workerContext = static_cast<WorkerContext*>(context);
-        WorkerRunLoop& runLoop = workerContext->thread()->runLoop();
+    if (context->isWorkerGlobalScope()) {
+        WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(context);
+        WorkerRunLoop& runLoop = workerGlobalScope->thread()->runLoop();
         String mode = webSocketChannelMode;
         mode.append(String::number(runLoop.createUniqueId()));
-        return WorkerThreadableWebSocketChannel::create(workerContext, client, mode);
+        return WorkerThreadableWebSocketChannel::create(workerGlobalScope, client, mode);
     }
 #endif // ENABLE(WORKERS)
 
index 4e14ed9..a3367b0 100644 (file)
@@ -218,7 +218,7 @@ void ThreadableWebSocketChannelClientWrapper::resume()
 
 void ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     wrapper->processPendingTasks();
 }
 
index b16dfd2..567b979 100644 (file)
@@ -41,7 +41,7 @@
 #include "ThreadableWebSocketChannelClientWrapper.h"
 #include "WebSocketChannel.h"
 #include "WebSocketChannelClient.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerLoaderProxy.h"
 #include "WorkerRunLoop.h"
 #include "WorkerThread.h"
 
 namespace WebCore {
 
-WorkerThreadableWebSocketChannel::WorkerThreadableWebSocketChannel(WorkerContext* context, WebSocketChannelClient* client, const String& taskMode)
-    : m_workerContext(context)
+WorkerThreadableWebSocketChannel::WorkerThreadableWebSocketChannel(WorkerGlobalScope* context, WebSocketChannelClient* client, const String& taskMode)
+    : m_workerGlobalScope(context)
     , m_workerClientWrapper(ThreadableWebSocketChannelClientWrapper::create(context, client))
-    , m_bridge(Bridge::create(m_workerClientWrapper, m_workerContext, taskMode))
+    , m_bridge(Bridge::create(m_workerClientWrapper, m_workerGlobalScope, taskMode))
 {
     m_bridge->initialize();
 }
@@ -168,9 +168,9 @@ void WorkerThreadableWebSocketChannel::Peer::connect(const KURL& url, const Stri
     m_mainWebSocketChannel->connect(url, protocol);
 }
 
-static void workerContextDidSend(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, ThreadableWebSocketChannel::SendResult sendRequestResult)
+static void workerGlobalScopeDidSend(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, ThreadableWebSocketChannel::SendResult sendRequestResult)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     workerClientWrapper->setSendRequestResult(sendRequestResult);
 }
 
@@ -180,7 +180,7 @@ void WorkerThreadableWebSocketChannel::Peer::send(const String& message)
     if (!m_mainWebSocketChannel || !m_workerClientWrapper)
         return;
     ThreadableWebSocketChannel::SendResult sendRequestResult = m_mainWebSocketChannel->send(message);
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
 }
 
 void WorkerThreadableWebSocketChannel::Peer::send(const ArrayBuffer& binaryData)
@@ -189,7 +189,7 @@ void WorkerThreadableWebSocketChannel::Peer::send(const ArrayBuffer& binaryData)
     if (!m_mainWebSocketChannel || !m_workerClientWrapper)
         return;
     ThreadableWebSocketChannel::SendResult sendRequestResult = m_mainWebSocketChannel->send(binaryData, 0, binaryData.byteLength());
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
 }
 
 void WorkerThreadableWebSocketChannel::Peer::send(const Blob& binaryData)
@@ -198,12 +198,12 @@ void WorkerThreadableWebSocketChannel::Peer::send(const Blob& binaryData)
     if (!m_mainWebSocketChannel || !m_workerClientWrapper)
         return;
     ThreadableWebSocketChannel::SendResult sendRequestResult = m_mainWebSocketChannel->send(binaryData);
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
 }
 
-static void workerContextDidGetBufferedAmount(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
+static void workerGlobalScopeDidGetBufferedAmount(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     workerClientWrapper->setBufferedAmount(bufferedAmount);
 }
 
@@ -213,7 +213,7 @@ void WorkerThreadableWebSocketChannel::Peer::bufferedAmount()
     if (!m_mainWebSocketChannel || !m_workerClientWrapper)
         return;
     unsigned long bufferedAmount = m_mainWebSocketChannel->bufferedAmount();
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidGetBufferedAmount, m_workerClientWrapper, bufferedAmount), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidGetBufferedAmount, m_workerClientWrapper, bufferedAmount), m_taskMode);
 }
 
 void WorkerThreadableWebSocketChannel::Peer::close(int code, const String& reason)
@@ -257,9 +257,9 @@ void WorkerThreadableWebSocketChannel::Peer::resume()
     m_mainWebSocketChannel->resume();
 }
 
-static void workerContextDidConnect(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& subprotocol, const String& extensions)
+static void workerGlobalScopeDidConnect(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& subprotocol, const String& extensions)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     workerClientWrapper->setSubprotocol(subprotocol);
     workerClientWrapper->setExtensions(extensions);
     workerClientWrapper->didConnect();
@@ -268,60 +268,60 @@ static void workerContextDidConnect(ScriptExecutionContext* context, PassRefPtr<
 void WorkerThreadableWebSocketChannel::Peer::didConnect()
 {
     ASSERT(isMainThread());
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidConnect, m_workerClientWrapper, m_mainWebSocketChannel->subprotocol(), m_mainWebSocketChannel->extensions()), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidConnect, m_workerClientWrapper, m_mainWebSocketChannel->subprotocol(), m_mainWebSocketChannel->extensions()), m_taskMode);
 }
 
-static void workerContextDidReceiveMessage(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& message)
+static void workerGlobalScopeDidReceiveMessage(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& message)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     workerClientWrapper->didReceiveMessage(message);
 }
 
 void WorkerThreadableWebSocketChannel::Peer::didReceiveMessage(const String& message)
 {
     ASSERT(isMainThread());
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidReceiveMessage, m_workerClientWrapper, message), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidReceiveMessage, m_workerClientWrapper, message), m_taskMode);
 }
 
-static void workerContextDidReceiveBinaryData(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassOwnPtr<Vector<char> > binaryData)
+static void workerGlobalScopeDidReceiveBinaryData(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassOwnPtr<Vector<char> > binaryData)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     workerClientWrapper->didReceiveBinaryData(binaryData);
 }
 
 void WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData)
 {
     ASSERT(isMainThread());
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidReceiveBinaryData, m_workerClientWrapper, binaryData), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidReceiveBinaryData, m_workerClientWrapper, binaryData), m_taskMode);
 }
 
-static void workerContextDidUpdateBufferedAmount(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
+static void workerGlobalScopeDidUpdateBufferedAmount(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     workerClientWrapper->didUpdateBufferedAmount(bufferedAmount);
 }
 
 void WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount(unsigned long bufferedAmount)
 {
     ASSERT(isMainThread());
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidUpdateBufferedAmount, m_workerClientWrapper, bufferedAmount), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidUpdateBufferedAmount, m_workerClientWrapper, bufferedAmount), m_taskMode);
 }
 
-static void workerContextDidStartClosingHandshake(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
+static void workerGlobalScopeDidStartClosingHandshake(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     workerClientWrapper->didStartClosingHandshake();
 }
 
 void WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake()
 {
     ASSERT(isMainThread());
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidStartClosingHandshake, m_workerClientWrapper), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidStartClosingHandshake, m_workerClientWrapper), m_taskMode);
 }
 
-static void workerContextDidClose(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
+static void workerGlobalScopeDidClose(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     workerClientWrapper->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, reason);
 }
 
@@ -329,25 +329,25 @@ void WorkerThreadableWebSocketChannel::Peer::didClose(unsigned long unhandledBuf
 {
     ASSERT(isMainThread());
     m_mainWebSocketChannel = 0;
-    m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidClose, m_workerClientWrapper, unhandledBufferedAmount, closingHandshakeCompletion, code, reason), m_taskMode);
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidClose, m_workerClientWrapper, unhandledBufferedAmount, closingHandshakeCompletion, code, reason), m_taskMode);
 }
 
-static void workerContextDidReceiveMessageError(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
+static void workerGlobalScopeDidReceiveMessageError(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
 {
-    ASSERT_UNUSED(context, context->isWorkerContext());
+    ASSERT_UNUSED(context, context->isWorkerGlobalScope());
     workerClientWrapper->didReceiveMessageError();
 }
 
 void WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError()
 {
-     ASSERT(isMainThread());
-     m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidReceiveMessageError, m_workerClientWrapper), m_taskMode);
+    ASSERT(isMainThread());
+    m_loaderProxy.postTaskForModeToWorkerGlobalScope(createCallbackTask(&workerGlobalScopeDidReceiveMessageError, m_workerClientWrapper), m_taskMode);
 }
 
-WorkerThreadableWebSocketChannel::Bridge::Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassRefPtr<WorkerContext> workerContext, const String& taskMode)
+WorkerThreadableWebSocketChannel::Bridge::Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassRefPtr<WorkerGlobalScope> workerGlobalScope, const String& taskMode)
     : m_workerClientWrapper(workerClientWrapper)
-    , m_workerContext(workerContext)
-    , m_loaderProxy(m_workerContext->thread()->workerLoaderProxy())
+    , m_workerGlobalScope(workerGlobalScope)
+    , m_loaderProxy(m_workerGlobalScope->thread()->workerLoaderProxy())
     , m_taskMode(taskMode)
     , m_peer(0)
 {
@@ -359,19 +359,19 @@ WorkerThreadableWebSocketChannel::Bridge::~Bridge()
     disconnect();
 }
 
-class WorkerThreadableWebSocketChannel::WorkerContextDidInitializeTask : public ScriptExecutionContext::Task {
+class WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask : public ScriptExecutionContext::Task {
 public:
     static PassOwnPtr<ScriptExecutionContext::Task> create(WorkerThreadableWebSocketChannel::Peer* peer,
                                                            WorkerLoaderProxy* loaderProxy,
                                                            PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
     {
-        return adoptPtr(new WorkerContextDidInitializeTask(peer, loaderProxy, workerClientWrapper));
+        return adoptPtr(new WorkerGlobalScopeDidInitializeTask(peer, loaderProxy, workerClientWrapper));
     }
 
-    virtual ~WorkerContextDidInitializeTask() { }
+    virtual ~WorkerGlobalScopeDidInitializeTask() { }
     virtual void performTask(ScriptExecutionContext* context) OVERRIDE
     {
-        ASSERT_UNUSED(context, context->isWorkerContext());
+        ASSERT_UNUSED(context, context->isWorkerGlobalScope());
         if (m_workerClientWrapper->failedWebSocketChannelCreation()) {
             // If Bridge::initialize() quitted earlier, we need to kick mainThreadDestroy() to delete the peer.
             OwnPtr<WorkerThreadableWebSocketChannel::Peer> peer = adoptPtr(m_peer);
@@ -383,7 +383,7 @@ public:
     virtual bool isCleanupTask() const OVERRIDE { return true; }
 
 private:
-    WorkerContextDidInitializeTask(WorkerThreadableWebSocketChannel::Peer* peer,
+    WorkerGlobalScopeDidInitializeTask(WorkerThreadableWebSocketChannel::Peer* peer,
                                    WorkerLoaderProxy* loaderProxy,
                                    PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
         : m_peer(peer)
@@ -405,8 +405,8 @@ void WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize(ScriptExecut
     RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper = prpClientWrapper;
 
     Peer* peer = Peer::create(clientWrapper, *loaderProxy, context, taskMode);
-    bool sent = loaderProxy->postTaskForModeToWorkerContext(
-        WorkerThreadableWebSocketChannel::WorkerContextDidInitializeTask::create(peer, loaderProxy, clientWrapper), taskMode);
+    bool sent = loaderProxy->postTaskForModeToWorkerGlobalScope(
+        WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask::create(peer, loaderProxy, clientWrapper), taskMode);
     if (!sent) {
         clientWrapper->clearPeer();
         delete peer;
@@ -593,7 +593,7 @@ void WorkerThreadableWebSocketChannel::Bridge::disconnect()
         m_peer = 0;
         m_loaderProxy.postTaskToLoader(createCallbackTask(&WorkerThreadableWebSocketChannel::mainThreadDestroy, peer.release()));
     }
-    m_workerContext = 0;
+    m_workerGlobalScope = 0;
 }
 
 void WorkerThreadableWebSocketChannel::mainThreadSuspend(ScriptExecutionContext* context, Peer* peer)
@@ -643,13 +643,13 @@ void WorkerThreadableWebSocketChannel::Bridge::setMethodNotCompleted()
 // which causes the bridge to get disconnected from the WebSocket and deleted if there is no other reference.
 void WorkerThreadableWebSocketChannel::Bridge::waitForMethodCompletion()
 {
-    if (!m_workerContext)
+    if (!m_workerGlobalScope)
         return;
-    WorkerRunLoop& runLoop = m_workerContext->thread()->runLoop();
+    WorkerRunLoop& runLoop = m_workerGlobalScope->thread()->runLoop();
     MessageQueueWaitResult result = MessageQueueMessageReceived;
     ThreadableWebSocketChannelClientWrapper* clientWrapper = m_workerClientWrapper.get();
-    while (m_workerContext && clientWrapper && !clientWrapper->syncMethodDone() && result != MessageQueueTerminated) {
-        result = runLoop.runInMode(m_workerContext.get(), m_taskMode); // May cause this bridge to get disconnected, which makes m_workerContext become null.
+    while (m_workerGlobalScope && clientWrapper && !clientWrapper->syncMethodDone() && result != MessageQueueTerminated) {
+        result = runLoop.runInMode(m_workerGlobalScope.get(), m_taskMode); // May cause this bridge to get disconnected, which makes m_workerGlobalScope become null.
         clientWrapper = m_workerClientWrapper.get();
     }
 }
index 33d7534..2421343 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "ThreadableWebSocketChannel.h"
 #include "WebSocketChannelClient.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -48,16 +48,16 @@ namespace WebCore {
 class KURL;
 class ScriptExecutionContext;
 class ThreadableWebSocketChannelClientWrapper;
-class WorkerContext;
+class WorkerGlobalScope;
 class WorkerLoaderProxy;
 class WorkerRunLoop;
 
 class WorkerThreadableWebSocketChannel : public RefCounted<WorkerThreadableWebSocketChannel>, public ThreadableWebSocketChannel {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassRefPtr<ThreadableWebSocketChannel> create(WorkerContext* workerContext, WebSocketChannelClient* client, const String& taskMode)
+    static PassRefPtr<ThreadableWebSocketChannel> create(WorkerGlobalScope* workerGlobalScope, WebSocketChannelClient* client, const String& taskMode)
     {
-        return adoptRef(new WorkerThreadableWebSocketChannel(workerContext, client, taskMode));
+        return adoptRef(new WorkerThreadableWebSocketChannel(workerGlobalScope, client, taskMode));
     }
     virtual ~WorkerThreadableWebSocketChannel();
 
@@ -126,9 +126,9 @@ private:
     // Bridge for Peer.  Running on the worker thread.
     class Bridge : public RefCounted<Bridge> {
     public:
-        static PassRefPtr<Bridge> create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassRefPtr<WorkerContext> workerContext, const String& taskMode)
+        static PassRefPtr<Bridge> create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassRefPtr<WorkerGlobalScope> workerGlobalScope, const String& taskMode)
         {
-            return adoptRef(new Bridge(workerClientWrapper, workerContext, taskMode));
+            return adoptRef(new Bridge(workerClientWrapper, workerGlobalScope, taskMode));
         }
         ~Bridge();
         void initialize();
@@ -147,7 +147,7 @@ private:
         using RefCounted<Bridge>::deref;
 
     private:
-        Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtr<WorkerContext>, const String& taskMode);
+        Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtr<WorkerGlobalScope>, const String& taskMode);
 
         static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
 
@@ -161,13 +161,13 @@ private:
         void waitForMethodCompletion();
 
         RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
-        RefPtr<WorkerContext> m_workerContext;
+        RefPtr<WorkerGlobalScope> m_workerGlobalScope;
         WorkerLoaderProxy& m_loaderProxy;
         String m_taskMode;
         Peer* m_peer;
     };
 
-    WorkerThreadableWebSocketChannel(WorkerContext*, WebSocketChannelClient*, const String& taskMode);
+    WorkerThreadableWebSocketChannel(WorkerGlobalScope*, WebSocketChannelClient*, const String& taskMode);
 
     static void mainThreadConnect(ScriptExecutionContext*, Peer*, const KURL&, const String& protocol);
     static void mainThreadSend(ScriptExecutionContext*, Peer*, const String& message);
@@ -180,9 +180,9 @@ private:
     static void mainThreadSuspend(ScriptExecutionContext*, Peer*);
     static void mainThreadResume(ScriptExecutionContext*, Peer*);
 
-    class WorkerContextDidInitializeTask;
+    class WorkerGlobalScopeDidInitializeTask;
 
-    RefPtr<WorkerContext> m_workerContext;
+    RefPtr<WorkerGlobalScope> m_workerGlobalScope;
     RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
     RefPtr<Bridge> m_bridge;
 };
index f89a4e8..f417dde 100644 (file)
@@ -38,7 +38,7 @@ SOURCES += \
     Modules/webdatabase/DatabaseContext.cpp \
     Modules/webdatabase/DatabaseServer.cpp \
     Modules/webdatabase/DatabaseSync.cpp \
-    Modules/webdatabase/WorkerContextWebDatabase.cpp \
+    Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp \
     accessibility/AccessibilityImageMapLink.cpp \
     accessibility/AccessibilityMediaControls.cpp \
     accessibility/AccessibilityMenuList.cpp \
@@ -242,13 +242,13 @@ SOURCES += \
     Modules/filesystem/FileWriterBase.cpp \
     Modules/filesystem/FileWriterSync.cpp \
     Modules/filesystem/LocalFileSystem.cpp \
-    Modules/filesystem/WorkerContextFileSystem.cpp \
+    Modules/filesystem/WorkerGlobalScopeFileSystem.cpp \
     Modules/navigatorcontentutils/NavigatorContentUtils.cpp \
     Modules/notifications/DOMWindowNotifications.cpp \
     Modules/notifications/Notification.cpp \
     Modules/notifications/NotificationCenter.cpp \
     Modules/notifications/NotificationController.cpp \
-    Modules/notifications/WorkerContextNotifications.cpp \
+    Modules/notifications/WorkerGlobalScopeNotifications.cpp \
     Modules/proximity/DeviceProximityController.cpp \
     Modules/proximity/DeviceProximityEvent.cpp \
     css/BasicShapeFunctions.cpp \
@@ -1369,7 +1369,7 @@ HEADERS += \
     bindings/js/JSNodeCustom.h \
     bindings/js/JSNodeFilterCondition.h \
     bindings/js/JSPluginElementFunctions.h \
-    bindings/js/JSWorkerContextBase.h \
+    bindings/js/JSWorkerGlobalScopeBase.h \
     bindings/js/JavaScriptCallFrame.h \
     bindings/js/PageScriptDebugServer.h \
     bindings/js/ScheduledAction.h \
@@ -1428,7 +1428,7 @@ HEADERS += \
     Modules/notifications/NotificationCenter.h \
     Modules/notifications/NotificationClient.h \
     Modules/notifications/NotificationController.h \
-    Modules/notifications/WorkerContextNotifications.h \
+    Modules/notifications/WorkerGlobalScopeNotifications.h \
     \
     Modules/proximity/DeviceProximityClient.h \
     Modules/proximity/DeviceProximityController.h \
@@ -1472,7 +1472,7 @@ HEADERS += \
     Modules/webdatabase/SQLTransactionStateMachine.h \
     Modules/webdatabase/SQLTransactionSync.h \
     Modules/webdatabase/SQLTransactionSyncCallback.h \
-    Modules/webdatabase/WorkerContextWebDatabase.h \
+    Modules/webdatabase/WorkerGlobalScopeWebDatabase.h \
     \
     css/BasicShapeFunctions.h \
     css/CSSAspectRatioValue.h \
@@ -2809,10 +2809,10 @@ HEADERS += \
     testing/MemoryInfo.h \
     testing/TypeConversions.h \
     workers/AbstractWorker.h \
-    workers/DedicatedWorkerContext.h \
+    workers/DedicatedWorkerGlobalScope.h \
     workers/DedicatedWorkerThread.h \
     workers/SharedWorker.h \
-    workers/WorkerContext.h \
+    workers/WorkerGlobalScope.h \
     workers/WorkerEventQueue.h \
     workers/Worker.h \
     workers/WorkerLocation.h \
@@ -3102,7 +3102,7 @@ enable?(INDEXED_DATABASE) {
         Modules/indexeddb/IDBRequest.cpp \
         Modules/indexeddb/IDBTransaction.cpp \
         Modules/indexeddb/PageGroupIndexedDatabase.cpp \
-        Modules/indexeddb/WorkerContextIndexedDatabase.cpp
+        Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp
 }
 
 enable?(DATA_TRANSFER_ITEMS) {
@@ -3186,9 +3186,9 @@ enable?(ICONDATABASE) {
 
 enable?(WORKERS) {
     SOURCES += \
-        bindings/js/JSDedicatedWorkerContextCustom.cpp \
-        bindings/js/JSWorkerContextBase.cpp \
-        bindings/js/JSWorkerContextCustom.cpp \
+        bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp \
+        bindings/js/JSWorkerGlobalScopeBase.cpp \
+        bindings/js/JSWorkerGlobalScopeCustom.cpp \
         bindings/js/JSWorkerCustom.cpp \
         bindings/js/WorkerScriptController.cpp \
         bindings/js/WorkerScriptDebugServer.cpp
@@ -3197,10 +3197,10 @@ enable?(WORKERS) {
         loader/WorkerThreadableLoader.cpp \
         page/WorkerNavigator.cpp \
         workers/AbstractWorker.cpp \
-        workers/DedicatedWorkerContext.cpp \
+        workers/DedicatedWorkerGlobalScope.cpp \
         workers/DedicatedWorkerThread.cpp \
         workers/Worker.cpp \
-        workers/WorkerContext.cpp \
+        workers/WorkerGlobalScope.cpp \
         workers/WorkerEventQueue.cpp \
         workers/WorkerLocation.cpp \
         workers/WorkerMessagingProxy.cpp \
@@ -3216,7 +3216,7 @@ enable?(SHARED_WORKERS) {
     SOURCES += \
         workers/DefaultSharedWorkerRepository.cpp \
         workers/SharedWorker.cpp \
-        workers/SharedWorkerContext.cpp \
+        workers/SharedWorkerGlobalScope.cpp \
         workers/SharedWorkerRepository.cpp \
         workers/SharedWorkerThread.cpp
 }
index e4a7510..25c581e 100644 (file)
@@ -205,9 +205,9 @@ endif ()
 
 if (ENABLE_WORKERS)
     list(APPEND WebCore_SOURCES
-        bindings/js/JSDedicatedWorkerContextCustom.cpp
-        bindings/js/JSWorkerContextBase.cpp
-        bindings/js/JSWorkerContextCustom.cpp
+        bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
+        bindings/js/JSWorkerGlobalScopeBase.cpp
+        bindings/js/JSWorkerGlobalScopeCustom.cpp
         bindings/js/JSWorkerCustom.cpp
         bindings/js/WorkerScriptController.cpp
         bindings/js/WorkerScriptDebugServer.cpp
@@ -303,9 +303,9 @@ list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/Internal
 file(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
 
 add_custom_command(
-    OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WINDOW_CONSTRUCTORS_FILE} ${WORKERCONTEXT_CONSTRUCTORS_FILE}
+    OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WINDOW_CONSTRUCTORS_FILE} ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
     DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES}
-    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --windowConstructorsFile ${WINDOW_CONSTRUCTORS_FILE} --workerContextConstructorsFile ${WORKERCONTEXT_CONSTRUCTORS_FILE}
+    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --windowConstructorsFile ${WINDOW_CONSTRUCTORS_FILE} --workerGlobalScopeConstructorsFile ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
     VERBATIM)
 
 GENERATE_BINDINGS(WebCore_SOURCES
@@ -317,7 +317,7 @@ GENERATE_BINDINGS(WebCore_SOURCES
     ${IDL_ATTRIBUTES_FILE}
     ${SUPPLEMENTAL_DEPENDENCY_FILE}
     ${WINDOW_CONSTRUCTORS_FILE}
-    ${WORKERCONTEXT_CONSTRUCTORS_FILE})
+    ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
 
 GENERATE_BINDINGS(WebCoreTestSupport_SOURCES
     "${WebCoreTestSupport_IDL_FILES}"
@@ -328,4 +328,4 @@ GENERATE_BINDINGS(WebCoreTestSupport_SOURCES
     ${IDL_ATTRIBUTES_FILE}
     ${SUPPLEMENTAL_DEPENDENCY_FILE}
     ${WINDOW_CONSTRUCTORS_FILE}
-    ${WORKERCONTEXT_CONSTRUCTORS_FILE})
+    ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
index a84e9a1..9cc6d26 100644 (file)
@@ -3704,7 +3704,7 @@ __ZN7WebCore7Element25dispatchAttrAdditionEventEPNS_9AttributeE
 __ZN7WebCore4Node28dispatchSubtreeModifiedEventEv
 __ZN7WebCore4Node36notifyLocalNodeListsAttributeChangedEv
 __ZN7WebCore15setDOMExceptionEPN3JSC9ExecStateEi
-__ZNK7WebCore22ScriptExecutionContext15isWorkerContextEv
+__ZNK7WebCore22ScriptExecutionContext15isWorkerGlobalScopeEv
 __ZN7WebCore9InputType16handleClickEventEPNS_10MouseEventE
 __ZN7WebCore9InputType22handleDOMActivateEventEPNS_5EventE
 __ZNK3WTF9HashTableIPN7WebCore4NodeES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E4findIS3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEENS_22HashTableConstIteratorIS3_S3_S5_S7_S9_S9_EERKT_
@@ -18528,7 +18528,7 @@ __ZN7WebCore19JSWorkerConstructor16getConstructDataERN3JSC13ConstructDataE
 __ZN7WebCore19JSWorkerConstructor17constructJSWorkerEPN3JSC9ExecStateE
 __ZN7WebCore6Worker6createERKN3WTF6StringEPNS_22ScriptExecutionContextERi
 __ZN7WebCore14AbstractWorkerC2EPNS_22ScriptExecutionContextE
-__ZN7WebCore18WorkerContextProxy6createEPNS_6WorkerE
+__ZN7WebCore18WorkerGlobalScopeProxy6createEPNS_6WorkerE
 __ZNK7WebCore14AbstractWorker22scriptExecutionContextEv
 __ZThn208_N7WebCore8Document25refScriptExecutionContextEv
 __ZN7WebCore14AbstractWorker10resolveURLERKN3WTF6StringERi
@@ -18558,7 +18558,7 @@ __ZN7WebCore20fillMessagePortArrayEPN3JSC9ExecStateENS0_7JSValueERN3WTF6VectorIN
 __ZN7WebCore6Worker11postMessageEN3WTF10PassRefPtrINS_21SerializedScriptValueEEEPKNS1_6VectorINS1_6RefPtrINS_11MessagePortEEELm1EEERi
 __ZN7WebCore11MessagePort16disentanglePortsEPKN3WTF6VectorINS1_6RefPtrIS0_EELm1EEERi
 __ZN3WTF10PassOwnPtrINS_6VectorINS_6OwnPtrIN7WebCore18MessagePortChannelEEELm1EEEED1Ev
-__ZN7WebCore20WorkerMessagingProxy26postMessageToWorkerContextEN3WTF10PassRefPtrINS_21SerializedScriptValueEEENS1_10PassOwnPtrINS1_6VectorINS1_6OwnPtrINS_18MessagePortChannelEEELm1EEEEE
+__ZN7WebCore20WorkerMessagingProxy26postMessageToWorkerGlobalScopeEN3WTF10PassRefPtrINS_21SerializedScriptValueEEENS1_10PassOwnPtrINS1_6VectorINS1_6OwnPtrINS_18MessagePortChannelEEELm1EEEEE
 __ZN3WTF6VectorINS_6OwnPtrIN7WebCore22ScriptExecutionContext4TaskEEELm0EE14expandCapacityEm
 __ZN3WTF6OwnPtrINS_6VectorINS0_IN7WebCore18MessagePortChannelEEELm1EEEED1Ev
 __ZThn16_N7WebCore24DocumentThreadableLoader18didReceiveResponseEPNS_17SubresourceLoaderERKNS_16ResourceResponseE
@@ -18571,7 +18571,7 @@ __ZN7WebCore18WorkerScriptLoader16didFinishLoadingEmd
 __ZThn104_N7WebCore6Worker14notifyFinishedEv
 __ZN7WebCore6Worker14notifyFinishedEv
 __ZThn208_NK7WebCore8Document9userAgentERKNS_4KURLE
-__ZN7WebCore20WorkerMessagingProxy18startWorkerContextERKNS_4KURLERKN3WTF6StringES7_
+__ZN7WebCore20WorkerMessagingProxy18startWorkerGlobalScopeERKNS_4KURLERKN3WTF6StringES7_
 __ZN7WebCore21DedicatedWorkerThread6createERKNS_4KURLERKN3WTF6StringES7_RNS_17WorkerLoaderProxyERNS_17WorkerObjectProxyE
 __ZN7WebCore12WorkerThreadC2ERKNS_4KURLERKN3WTF6StringES7_RNS_17WorkerLoaderProxyERNS_20WorkerReportingProxyE
 __ZN7WebCore13WorkerRunLoopC1Ev
@@ -18587,58 +18587,58 @@ __ZN7WebCore24InspectorInstrumentation18scriptImportedImplEPNS_19InstrumentingAg
 __ZN7WebCore18WorkerScriptLoaderD0Ev
 __ZN7WebCore12WorkerThread17workerThreadStartEPv
 __ZN7WebCore12WorkerThread12workerThreadEv
-__ZN7WebCore21DedicatedWorkerThread19createWorkerContextERKNS_4KURLERKN3WTF6StringE
+__ZN7WebCore21DedicatedWorkerThread19createWorkerGlobalScopeERKNS_4KURLERKN3WTF6StringE
 __ZN7WebCore24DocumentThreadableLoader21derefThreadableLoaderEv
-__ZN7WebCore22DedicatedWorkerContextC1ERKNS_4KURLERKN3WTF6StringEPNS_21DedicatedWorkerThreadE
-__ZN7WebCore13WorkerContextC2ERKNS_4KURLERKN3WTF6StringEPNS_12WorkerThreadE
-__ZN7WebCore22WorkerScriptControllerC1EPNS_13WorkerContextE
-__ZN7WebCore22WorkerScriptControllerC2EPNS_13WorkerContextE
-__ZN7WebCore25WorkerInspectorControllerC1EPNS_13WorkerContextE
-__ZN7WebCore25WorkerInspectorControllerC2EPNS_13WorkerContextE
+__ZN7WebCore22DedicatedWorkerGlobalScopeC1ERKNS_4KURLERKN3WTF6StringEPNS_21DedicatedWorkerThreadE
+__ZN7WebCore13WorkerGlobalScopeC2ERKNS_4KURLERKN3WTF6StringEPNS_12WorkerThreadE
+__ZN7WebCore22WorkerScriptControllerC1EPNS_13WorkerGlobalScopeE
+__ZN7WebCore22WorkerScriptControllerC2EPNS_13WorkerGlobalScopeE
+__ZN7WebCore25WorkerInspectorControllerC1EPNS_13WorkerGlobalScopeE
+__ZN7WebCore25WorkerInspectorControllerC2EPNS_13WorkerGlobalScopeE
 __ZN7WebCore21InjectedScriptManager15createForWorkerEv
-__ZN7WebCore19WorkerDebuggerAgent6createEPNS_19InstrumentingAgentsEPNS_14InspectorStateEPNS_13WorkerContextEPNS_21InjectedScriptManagerE
+__ZN7WebCore19WorkerDebuggerAgent6createEPNS_19InstrumentingAgentsEPNS_14InspectorStateEPNS_13WorkerGlobalScopeEPNS_21InjectedScriptManagerE
 __ZN7WebCore23WorkerScriptDebugServerC1Ev
 __ZN7WebCore22WorkerScriptController8evaluateERKNS_16ScriptSourceCodeE
 __ZN7WebCore22WorkerScriptController8evaluateERKNS_16ScriptSourceCodeEPNS_11ScriptValueE
 __ZN7WebCore22WorkerScriptController10initScriptEv
-__ZN7WebCore24JSWorkerContextPrototypenwEmPN3JSC12VME
-__ZNK7WebCore22DedicatedWorkerContext24isDedicatedWorkerContextEv
-__ZN7WebCore33JSDedicatedWorkerContextPrototypenwEmPN3JSC12VME
-__ZThn128_N7WebCore22DedicatedWorkerContext24toDedicatedWorkerContextEv
-__ZN7WebCore24JSDedicatedWorkerContextC1ERN3JSC12VMEPNS1_9StructureEN3WTF10PassRefPtrINS_22DedicatedWorkerContextEEE
-__ZN7WebCore15JSWorkerContextC2ERN3JSC12VMEPNS1_9StructureEN3WTF10PassRefPtrINS_13WorkerContextEEE
-__ZN7WebCore19JSWorkerContextBaseC2ERN3JSC12VMEPNS1_9StructureEN3WTF10PassRefPtrINS_13WorkerContextEEE
+__ZN7WebCore24JSWorkerGlobalScopePrototypenwEmPN3JSC12VME
+__ZNK7WebCore22DedicatedWorkerGlobalScope24isDedicatedWorkerGlobalScopeEv
+__ZN7WebCore33JSDedicatedWorkerGlobalScopePrototypenwEmPN3JSC12VME
+__ZThn128_N7WebCore22DedicatedWorkerGlobalScope24toDedicatedWorkerGlobalScopeEv
+__ZN7WebCore24JSDedicatedWorkerGlobalScopeC1ERN3JSC12VMEPNS1_9StructureEN3WTF10PassRefPtrINS_22DedicatedWorkerGlobalScopeEEE
+__ZN7WebCore15JSWorkerGlobalScopeC2ERN3JSC12VMEPNS1_9StructureEN3WTF10PassRefPtrINS_13WorkerGlobalScopeEEE
+__ZN7WebCore19JSWorkerGlobalScopeBaseC2ERN3JSC12VMEPNS1_9StructureEN3WTF10PassRefPtrINS_13WorkerGlobalScopeEEE
 __ZN7WebCore11normalWorldERN3JSC12VME
 __ZNK3JSC14JSGlobalObject17supportsProfilingEv
 __ZNK3JSC14JSGlobalObject22supportsRichSourceInfoEv
-__ZN7WebCore24JSDedicatedWorkerContext3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE
-__ZN3JSC9lookupPutIN7WebCore24JSDedicatedWorkerContextEEEbPNS_9ExecStateERKNS_10IdentifierENS_7JSValueEPKNS_9HashTableEPT_
-__ZN7WebCore36setJSDedicatedWorkerContextOnmessageEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
-__ZThn128_N7WebCore13WorkerContext15eventTargetDataEv
-__ZThn128_N7WebCore13WorkerContext21ensureEventTargetDataEv
+__ZN7WebCore24JSDedicatedWorkerGlobalScope3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE
+__ZN3JSC9lookupPutIN7WebCore24JSDedicatedWorkerGlobalScopeEEEbPNS_9ExecStateERKNS_10IdentifierENS_7JSValueEPKNS_9HashTableEPT_
+__ZN7WebCore36setJSDedicatedWorkerGlobalScopeOnmessageEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
+__ZThn128_N7WebCore13WorkerGlobalScope15eventTargetDataEv
+__ZThn128_N7WebCore13WorkerGlobalScope21ensureEventTargetDataEv
 __ZN7WebCore23WorkerThreadStartupDataD1Ev
 __ZN7WebCore21DedicatedWorkerThread12runEventLoopEv
-__ZNK7WebCore13WorkerContext18hasPendingActivityEv
+__ZNK7WebCore13WorkerGlobalScope18hasPendingActivityEv
 __ZThn8_N7WebCore20WorkerMessagingProxy21reportPendingActivityEb
 __ZThn208_N7WebCore8Document8postTaskEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4TaskEEE
 __ZN7WebCore12WorkerThread12runEventLoopEv
-__ZN7WebCore13WorkerRunLoop3runEPNS_13WorkerContextE
+__ZN7WebCore13WorkerRunLoop3runEPNS_13WorkerGlobalScopeE
 __ZN7WebCore17WorkerSharedTimer16setFiredFunctionEPFvvE
 __ZN7WebCore17WorkerSharedTimer4stopEv
-__ZN7WebCore13WorkerRunLoop9runInModeEPNS_13WorkerContextERKNS_13ModePredicateE
+__ZN7WebCore13WorkerRunLoop9runInModeEPNS_13WorkerGlobalScopeERKNS_13ModePredicateE
 __ZN3WTF12MessageQueueIN7WebCore13WorkerRunLoop4TaskEE33waitForMessageFilteredWithTimeoutIKNS1_13ModePredicateEEENS_10PassOwnPtrIS3_EERNS_22MessageQueueWaitResultERT_d
 __ZN3WTF6OwnPtrIN7WebCore13WorkerRunLoop4TaskEED1Ev
-__ZN7WebCore24MessageWorkerContextTask11performTaskEPNS_22ScriptExecutionContextE
+__ZN7WebCore24MessageWorkerGlobalScopeTask11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCore11MessagePort13entanglePortsERNS_22ScriptExecutionContextEN3WTF10PassOwnPtrINS3_6VectorINS3_6OwnPtrINS_18MessagePortChannelEEELm1EEEEE
 __ZN7WebCore12MessageEvent6createEN3WTF10PassOwnPtrINS1_6VectorINS1_6RefPtrINS_11MessagePortEEELm1EEEEENS1_10PassRefPtrINS_21SerializedScriptValueEEERKNS1_6StringESE_NS9_INS_9DOMWindowEEE
 __ZN7WebCore12MessageEventC1EN3WTF10PassRefPtrINS_21SerializedScriptValueEEERKNS1_6StringES7_NS2_INS_9DOMWindowEEENS1_10PassOwnPtrINS1_6VectorINS1_6RefPtrINS_11MessagePortEEELm1EEEEE
-__ZThn128_N7WebCore13WorkerContext14refEventTargetEv
-__ZThn128_NK7WebCore13WorkerContext22scriptExecutionContextEv
-__ZNK7WebCore13WorkerContext22isJSExecutionForbiddenEv
+__ZThn128_N7WebCore13WorkerGlobalScope14refEventTargetEv
+__ZThn128_NK7WebCore13WorkerGlobalScope22scriptExecutionContextEv
+__ZNK7WebCore13WorkerGlobalScope22isJSExecutionForbiddenEv
 __ZNK7WebCore22WorkerScriptController20isExecutionForbiddenEv
 __ZNK7WebCore22ScriptExecutionContext10isDocumentEv
 __ZN7WebCoreL11performTaskEPv
-__ZNK7WebCore13WorkerContext15isWorkerContextEv
+__ZNK7WebCore13WorkerGlobalScope15isWorkerGlobalScopeEv
 __ZN7WebCore30WorkerThreadActivityReportTask11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCore30WorkerThreadActivityReportTaskD0Ev
 __ZNK7WebCore12MessageEvent14isMessageEventEv
@@ -18653,25 +18653,25 @@ __ZN7WebCore11EventTarget21toDOMApplicationCacheEv
 __ZN7WebCore11EventTarget13toMessagePortEv
 __ZN7WebCore11EventTarget8toWorkerEv
 __ZN7WebCore19toJSDOMGlobalObjectEPNS_22ScriptExecutionContextEPN3JSC9ExecStateE
-__ZN7WebCore24JSDedicatedWorkerContext18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
-__ZN7WebCore15JSWorkerContext18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
-__ZN7WebCore15JSWorkerContext26getOwnPropertySlotDelegateEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
-__ZN7WebCore37jsWorkerContextUint32ArrayConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
+__ZN7WebCore24JSDedicatedWorkerGlobalScope18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
+__ZN7WebCore15JSWorkerGlobalScope18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
+__ZN7WebCore15JSWorkerGlobalScope26getOwnPropertySlotDelegateEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
+__ZN7WebCore37jsWorkerGlobalScopeUint32ArrayConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore13JSUint32Array14getConstructorEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE
-__ZN7WebCore34jsWorkerContextDataViewConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
+__ZN7WebCore34jsWorkerGlobalScopeDataViewConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore10JSDataView14getConstructorEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE
-__ZN7WebCore33JSDedicatedWorkerContextPrototype18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
-__ZN7WebCore52jsDedicatedWorkerContextPrototypeFunctionPostMessageEPN3JSC9ExecStateE
-__ZN7WebCore26toJSDedicatedWorkerContextEN3JSC7JSValueE
-__ZN7WebCore24JSDedicatedWorkerContext11postMessageEPN3JSC9ExecStateE
-__ZN7WebCore17handlePostMessageINS_22DedicatedWorkerContextEEEN3JSC7JSValueEPNS2_9ExecStateEPT_
-__ZN7WebCore22DedicatedWorkerContext11postMessageEN3WTF10PassRefPtrINS_21SerializedScriptValueEEEPKNS1_6VectorINS1_6RefPtrINS_11MessagePortEEELm1EEERi
+__ZN7WebCore33JSDedicatedWorkerGlobalScopePrototype18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
+__ZN7WebCore52jsDedicatedWorkerGlobalScopePrototypeFunctionPostMessageEPN3JSC9ExecStateE
+__ZN7WebCore26toJSDedicatedWorkerGlobalScopeEN3JSC7JSValueE
+__ZN7WebCore24JSDedicatedWorkerGlobalScope11postMessageEPN3JSC9ExecStateE
+__ZN7WebCore17handlePostMessageINS_22DedicatedWorkerGlobalScopeEEEN3JSC7JSValueEPNS2_9ExecStateEPT_
+__ZN7WebCore22DedicatedWorkerGlobalScope11postMessageEN3WTF10PassRefPtrINS_21SerializedScriptValueEEEPKNS1_6VectorINS1_6RefPtrINS_11MessagePortEEELm1EEERi
 __ZThn8_N7WebCore20WorkerMessagingProxy25postMessageToWorkerObjectEN3WTF10PassRefPtrINS_21SerializedScriptValueEEENS1_10PassOwnPtrINS1_6VectorINS1_6OwnPtrINS_18MessagePortChannelEEELm1EEEEE
 __ZN7WebCore20WorkerMessagingProxy25postMessageToWorkerObjectEN3WTF10PassRefPtrINS_21SerializedScriptValueEEENS1_10PassOwnPtrINS1_6VectorINS1_6OwnPtrINS_18MessagePortChannelEEELm1EEEEE
-__ZThn128_N7WebCore13WorkerContext16derefEventTargetEv
-__ZN7WebCore22DedicatedWorkerContext6threadEv
+__ZThn128_N7WebCore13WorkerGlobalScope16derefEventTargetEv
+__ZN7WebCore22DedicatedWorkerGlobalScope6threadEv
 __ZThn8_N7WebCore20WorkerMessagingProxy30confirmMessageFromWorkerObjectEb
-__ZN7WebCore24MessageWorkerContextTaskD0Ev
+__ZN7WebCore24MessageWorkerGlobalScopeTaskD0Ev
 __ZN7WebCore17MessageWorkerTask11performTaskEPNS_22ScriptExecutionContextE
 __ZThn24_N7WebCore6Worker14refEventTargetEv
 __ZThn24_NK7WebCore14AbstractWorker22scriptExecutionContextEv
@@ -18690,7 +18690,7 @@ __ZN7WebCore14JSMessageEventD1Ev
 __ZN7WebCore12MessageEventD0Ev
 __ZN7WebCore6WorkerD0Ev
 __ZN7WebCore20WorkerMessagingProxy21workerObjectDestroyedEv
-__ZN7WebCore20WorkerMessagingProxy22terminateWorkerContextEv
+__ZN7WebCore20WorkerMessagingProxy22terminateWorkerGlobalScopeEv
 __ZN7WebCore12WorkerThread4stopEv
 __ZN7WebCore22WorkerScriptController28scheduleExecutionTerminationEv
 __ZN7WebCore15DatabaseTracker31interruptAllDatabasesForContextEPKNS_22ScriptExecutionContextE
@@ -18698,18 +18698,18 @@ __ZN7WebCore14AbstractWorkerD2Ev
 __ZN7WebCore29WorkerThreadShutdownStartTask11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCore24DatabaseTaskSynchronizerC1Ev
 __ZN7WebCore24DatabaseTaskSynchronizer13taskCompletedEv
-__ZN7WebCore13WorkerContext21notifyObserversOfStopEv
+__ZN7WebCore13WorkerGlobalScope21notifyObserversOfStopEv
 __ZN7WebCore24DatabaseTaskSynchronizer21waitForTaskCompletionEv
-__ZN7WebCore13WorkerContext8postTaskEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4TaskEEE
+__ZN7WebCore13WorkerGlobalScope8postTaskEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4TaskEEE
 __ZN7WebCore29WorkerThreadShutdownStartTaskD0Ev
 __ZN7WebCore30WorkerThreadShutdownFinishTask11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCore22WorkerScriptControllerD1Ev
 __ZN7WebCore22WorkerScriptControllerD2Ev
-__ZN7WebCore24JSWorkerContextPrototypeD1Ev
-__ZN7WebCore33JSDedicatedWorkerContextPrototypeD1Ev
+__ZN7WebCore24JSWorkerGlobalScopePrototypeD1Ev
+__ZN7WebCore33JSDedicatedWorkerGlobalScopePrototypeD1Ev
 __ZN7WebCore23JSMessageEventPrototypeD1Ev
-__ZN7WebCore24JSDedicatedWorkerContextD1Ev
-__ZN7WebCore19JSWorkerContextBaseD2Ev
+__ZN7WebCore24JSDedicatedWorkerGlobalScopeD1Ev
+__ZN7WebCore19JSWorkerGlobalScopeBaseD2Ev
 __ZN7WebCore19WebCoreJSClientDataD0Ev
 __ZN7WebCore15DOMWrapperWorldD1Ev
 __ZN7WebCore15DOMWrapperWorldD2Ev
@@ -18717,13 +18717,13 @@ __ZNK3WTF9HashTableIPN7WebCore15DOMWrapperWorldES3_NS_17IdentityExtractorIS3_EEN
 __ZN3WTF9HashTableIPN7WebCore15DOMWrapperWorldES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E6removeEPS3_
 __ZN7WebCore13WorkerRunLoop9terminateEv
 __ZN7WebCore30WorkerThreadShutdownFinishTaskD0Ev
-__ZN7WebCore22DedicatedWorkerContextD0Ev
-__ZN7WebCore13WorkerContextD2Ev
-__ZThn8_N7WebCore20WorkerMessagingProxy22workerContextDestroyedEv
+__ZN7WebCore22DedicatedWorkerGlobalScopeD0Ev
+__ZN7WebCore13WorkerGlobalScopeD2Ev
+__ZThn8_N7WebCore20WorkerMessagingProxy22workerGlobalScopeDestroyedEv
 __ZN7WebCore25WorkerInspectorControllerD1Ev
 __ZN7WebCore25WorkerInspectorControllerD2Ev
 __ZN7WebCore12_GLOBAL__N_118WorkerRuntimeAgentD0Ev
-__ZN7WebCore26WorkerContextDestroyedTask11performTaskEPNS_22ScriptExecutionContextE
+__ZN7WebCore26WorkerGlobalScopeDestroyedTask11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCore19WorkerDebuggerAgentD0Ev
 __ZN7WebCore17ScriptDebugServerD2Ev
 __ZN7WebCore21DedicatedWorkerThreadD0Ev
@@ -18736,7 +18736,7 @@ __ZN7WebCore20WorkerMessagingProxyD0Ev
 __ZN7WebCore19ICUConverterWrapperD1Ev
 __ZThn208_N7WebCore8Document27derefScriptExecutionContextEv
 __ZN7WebCore10EventNamesD2Ev
-__ZN7WebCore26WorkerContextDestroyedTaskD0Ev
+__ZN7WebCore26WorkerGlobalScopeDestroyedTaskD0Ev
 __ZN3WTF14ThreadSpecificIN7WebCore16ThreadGlobalDataEE7destroyEPv
 __ZN7WebCore16ThreadGlobalDataD1Ev
 __ZN7WebCore19JSWorkerConstructorD1Ev
@@ -26293,7 +26293,7 @@ __ZN3WTF6VectorINS_6RefPtrIN7WebCore21ComplexTextController14ComplexTextRunEEELm
 __ZN7WebCore18RenderLayerBacking19updateContentsScaleEf
 __ZN7WebCore15GraphicsLayerCA19updateContentsScaleEv
 __ZN7WebCore12WorkerThread17workerThreadCountEv
-__ZN7WebCore15JSWorkerContext13visitChildrenERN3JSC9MarkStackE
+__ZN7WebCore15JSWorkerGlobalScope13visitChildrenERN3JSC9MarkStackE
 __ZN7WebCore12SharedWorker6createERKN3WTF6StringES4_PNS_22ScriptExecutionContextERi
 __ZN7WebCore11MessagePort11disentangleERi
 __ZN7WebCore22SharedWorkerRepository7connectEN3WTF10PassRefPtrINS_12SharedWorkerEEENS1_10PassOwnPtrINS_18MessagePortChannelEEERKNS_4KURLERKNS1_6StringERi
@@ -26310,22 +26310,22 @@ __ZN7WebCore24SharedWorkerScriptLoader14notifyFinishedEv
 __ZN7WebCore29DefaultSharedWorkerRepository18workerScriptLoadedERNS_17SharedWorkerProxyERKN3WTF6StringES6_NS3_10PassOwnPtrINS_18MessagePortChannelEEE
 __ZN7WebCore18SharedWorkerThread6createERKN3WTF6StringERKNS_4KURLES4_S4_RNS_17WorkerLoaderProxyERNS_20WorkerReportingProxyE
 __ZN7WebCore24SharedWorkerScriptLoaderD0Ev
-__ZN7WebCore18SharedWorkerThread19createWorkerContextERKNS_4KURLERKN3WTF6StringE
-__ZN7WebCore19SharedWorkerContextC1ERKN3WTF6StringERKNS_4KURLES4_PNS_18SharedWorkerThreadE
-__ZNK7WebCore13WorkerContext24isDedicatedWorkerContextEv
-__ZN7WebCore30JSSharedWorkerContextPrototypenwEmPN3JSC12VME
-__ZThn128_N7WebCore19SharedWorkerContext21toSharedWorkerContextEv
-__ZN7WebCore21JSSharedWorkerContextC1ERN3JSC12VMEPNS1_9StructureEN3WTF10PassRefPtrINS_19SharedWorkerContextEEE
-__ZN7WebCore21JSSharedWorkerContext3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE
-__ZN3JSC9lookupPutIN7WebCore21JSSharedWorkerContextEEEbPNS_9ExecStateERKNS_10IdentifierENS_7JSValueEPKNS_9HashTableEPT_
-__ZN7WebCore33setJSSharedWorkerContextOnconnectEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
+__ZN7WebCore18SharedWorkerThread19createWorkerGlobalScopeERKNS_4KURLERKN3WTF6StringE
+__ZN7WebCore19SharedWorkerGlobalScopeC1ERKN3WTF6StringERKNS_4KURLES4_PNS_18SharedWorkerThreadE
+__ZNK7WebCore13WorkerGlobalScope24isDedicatedWorkerGlobalScopeEv
+__ZN7WebCore30JSSharedWorkerGlobalScopePrototypenwEmPN3JSC12VME
+__ZThn128_N7WebCore19SharedWorkerGlobalScope21toSharedWorkerGlobalScopeEv
+__ZN7WebCore21JSSharedWorkerGlobalScopeC1ERN3JSC12VMEPNS1_9StructureEN3WTF10PassRefPtrINS_19SharedWorkerGlobalScopeEEE
+__ZN7WebCore21JSSharedWorkerGlobalScope3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE
+__ZN3JSC9lookupPutIN7WebCore21JSSharedWorkerGlobalScopeEEEbPNS_9ExecStateERKNS_10IdentifierENS_7JSValueEPKNS_9HashTableEPT_
+__ZN7WebCore33setJSSharedWorkerGlobalScopeOnconnectEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
 __ZN7WebCore23SharedWorkerConnectTask11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCore18createConnectEventEN3WTF10PassRefPtrINS_11MessagePortEEE
-__ZN7WebCore11EventTarget24toDedicatedWorkerContextEv
+__ZN7WebCore11EventTarget24toDedicatedWorkerGlobalScopeEv
 __ZN7WebCore11EventTarget14toSharedWorkerEv
 __ZN7WebCore23SharedWorkerConnectTaskD0Ev
-__ZN7WebCore13WorkerContext25refScriptExecutionContextEv
-__ZN7WebCore13WorkerContext27derefScriptExecutionContextEv
+__ZN7WebCore13WorkerGlobalScope25refScriptExecutionContextEv
+__ZN7WebCore13WorkerGlobalScope27derefScriptExecutionContextEv
 __ZN7WebCore14JSSharedWorker13visitChildrenERN3JSC9MarkStackE
 __ZN7WebCore19JSSharedWorkerOwner26isReachableFromOpaqueRootsEN3JSC6HandleINS1_7UnknownEEEPvRNS1_9MarkStackE
 __ZN7WebCore19JSSharedWorkerOwner8finalizeEN3JSC6HandleINS1_7UnknownEEEPv
@@ -26333,19 +26333,19 @@ __ZN7WebCore14JSSharedWorkerD1Ev
 __ZN7WebCore12SharedWorkerD0Ev
 __ZNK3WTF9HashTableIPN7WebCore8DocumentES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E8containsIS3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEEbRKT_
 __ZN7WebCore17SharedWorkerProxy16documentDetachedEPNS_8DocumentE
-__ZN7WebCore30JSSharedWorkerContextPrototypeD1Ev
-__ZN7WebCore21JSSharedWorkerContextD1Ev
-__ZN7WebCore19SharedWorkerContextD0Ev
-__ZThn16_N7WebCore17SharedWorkerProxy22workerContextDestroyedEv
+__ZN7WebCore30JSSharedWorkerGlobalScopePrototypeD1Ev
+__ZN7WebCore21JSSharedWorkerGlobalScopeD1Ev
+__ZN7WebCore19SharedWorkerGlobalScopeD0Ev
+__ZThn16_N7WebCore17SharedWorkerProxy22workerGlobalScopeDestroyedEv
 __ZN7WebCore29DefaultSharedWorkerRepository11removeProxyEPNS_17SharedWorkerProxyE
 __ZN7WebCore17SharedWorkerProxyD0Ev
 __ZN7WebCore18SharedWorkerThreadD0Ev
 __ZN7WebCore18jsSharedWorkerPortEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore16JSAbstractWorker3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE
 __ZN3JSC9lookupPutIN7WebCore16JSAbstractWorkerEEEbPNS_9ExecStateERKNS_10IdentifierENS_7JSValueEPKNS_9HashTableEPT_
-__ZN7WebCore21JSSharedWorkerContext18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
-__ZN7WebCore24jsWorkerContextNavigatorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
-__ZNK7WebCore13WorkerContext9navigatorEv
+__ZN7WebCore21JSSharedWorkerGlobalScope18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
+__ZN7WebCore24jsWorkerGlobalScopeNavigatorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
+__ZNK7WebCore13WorkerGlobalScope9navigatorEv
 __ZN7WebCore15WorkerNavigatorC1ERKN3WTF6StringE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_15WorkerNavigatorE
 __ZN7WebCore4wrapINS_17JSWorkerNavigatorENS_15WorkerNavigatorEEEN3JSC7JSValueEPNS3_9ExecStateEPNS_17JSDOMGlobalObjectEPT0_
@@ -26354,8 +26354,8 @@ __ZN7WebCore17JSWorkerNavigator15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGloba
 __ZN7WebCore12cacheWrapperINS_15WorkerNavigatorEEEvPNS_15DOMWrapperWorldEPT_PNS_12JSDOMWrapperE
 __ZN7WebCore17JSWorkerNavigator18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
 __ZN3JSC18getStaticValueSlotIN7WebCore17JSWorkerNavigatorENS1_12JSDOMWrapperEEEbPNS_9ExecStateEPKNS_9HashTableEPT_RKNS_10IdentifierERNS_12PropertySlotE
-__ZN7WebCore23jsWorkerContextLocationEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
-__ZNK7WebCore13WorkerContext8locationEv
+__ZN7WebCore23jsWorkerGlobalScopeLocationEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
+__ZNK7WebCore13WorkerGlobalScope8locationEv
 __ZN7WebCore14WorkerLocation6createERKNS_4KURLE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_14WorkerLocationE
 __ZN7WebCore4wrapINS_16JSWorkerLocationENS_14WorkerLocationEEEN3JSC7JSValueEPNS3_9ExecStateEPNS_17JSDOMGlobalObjectEPT0_
@@ -26365,7 +26365,7 @@ __ZN7WebCore12cacheWrapperINS_14WorkerLocationEEEvPNS_15DOMWrapperWorldEPT_PNS_1
 __ZN7WebCore22JSWorkerNavigatorOwner26isReachableFromOpaqueRootsEN3JSC6HandleINS1_7UnknownEEEPvRNS1_9MarkStackE
 __ZN7WebCore16JSWorkerLocation18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
 __ZN3JSC18getStaticValueSlotIN7WebCore16JSWorkerLocationENS1_12JSDOMWrapperEEEbPNS_9ExecStateEPKNS_9HashTableEPT_RKNS_10IdentifierERNS_12PropertySlotE
-__ZN7WebCore24JSWorkerContextPrototype18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
+__ZN7WebCore24JSWorkerGlobalScopePrototype18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
 __ZN7WebCore14AbstractWorker16contextDestroyedEv
 __ZN7WebCore21JSWorkerLocationOwner8finalizeEN3JSC6HandleINS1_7UnknownEEEPv
 __ZN7WebCore22JSWorkerNavigatorOwner8finalizeEN3JSC6HandleINS1_7UnknownEEEPv
@@ -26379,12 +26379,12 @@ __ZThn24_N7WebCore14AbstractWorker14refEventTargetEv
 __ZThn24_N7WebCore12SharedWorker14toSharedWorkerEv
 __ZThn24_N7WebCore14AbstractWorker16derefEventTargetEv
 __ZN7WebCore52jsAbstractWorkerPrototypeFunctionRemoveEventListenerEPN3JSC9ExecStateE
-__ZN7WebCore15JSWorkerContext3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE
-__ZN3JSC9lookupPutIN7WebCore15JSWorkerContextEEEbPNS_9ExecStateERKNS_10IdentifierENS_7JSValueEPKNS_9HashTableEPT_
-__ZNK7WebCore19JSWorkerContextBase22scriptExecutionContextEv
-__ZN7WebCore13WorkerContext16errorEventTargetEv
-__ZNK7WebCore13WorkerContext18virtualCompleteURLERKN3WTF6StringE
-__ZN7WebCore13WorkerContext21logExceptionToConsoleERKN3WTF6StringEiS4_NS1_10PassRefPtrINS_15ScriptCallStackEEE
+__ZN7WebCore15JSWorkerGlobalScope3putEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE
+__ZN3JSC9lookupPutIN7WebCore15JSWorkerGlobalScopeEEEbPNS_9ExecStateERKNS_10IdentifierENS_7JSValueEPKNS_9HashTableEPT_
+__ZNK7WebCore19JSWorkerGlobalScopeBase22scriptExecutionContextEv
+__ZN7WebCore13WorkerGlobalScope16errorEventTargetEv
+__ZNK7WebCore13WorkerGlobalScope18virtualCompleteURLERKN3WTF6StringE
+__ZN7WebCore13WorkerGlobalScope21logExceptionToConsoleERKN3WTF6StringEiS4_NS1_10PassRefPtrINS_15ScriptCallStackEEE
 __ZThn16_N7WebCore17SharedWorkerProxy27postExceptionToWorkerObjectERKN3WTF6StringEiS4_
 __ZN7WebCore17SharedWorkerProxy27postExceptionToWorkerObjectERKN3WTF6StringEiS4_
 __ZN7WebCore18createCallbackTaskIN3WTF6StringERKS2_iiS2_S4_EENS1_10PassOwnPtrINS_22ScriptExecutionContext4TaskEEEPFvPS6_T0_T2_T4_ERKT_RKT1_RKT3_
@@ -26393,17 +26393,17 @@ __ZN7WebCore8Document8postTaskEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4Tas
 __ZN7WebCore16CrossThreadTask3IN3WTF6StringERKS2_iiS2_S4_E11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCoreL17postExceptionTaskEPNS_22ScriptExecutionContextERKN3WTF6StringEiS5_
 __ZN7WebCore16CrossThreadTask3IN3WTF6StringERKS2_iiS2_S4_ED0Ev
-__ZN7WebCore37jsWorkerContextPrototypeFunctionCloseEPN3JSC9ExecStateE
-__ZN7WebCore17toJSWorkerContextEN3JSC7JSValueE
-__ZN7WebCore13WorkerContext5closeEv
-__ZNK7WebCore22CloseWorkerContextTask13isCleanupTaskEv
-__ZN7WebCore22CloseWorkerContextTask11performTaskEPNS_22ScriptExecutionContextE
-__ZThn16_N7WebCore17SharedWorkerProxy19workerContextClosedEv
-__ZN7WebCore22CloseWorkerContextTaskD0Ev
+__ZN7WebCore37jsWorkerGlobalScopePrototypeFunctionCloseEPN3JSC9ExecStateE
+__ZN7WebCore17toJSWorkerGlobalScopeEN3JSC7JSValueE
+__ZN7WebCore13WorkerGlobalScope5closeEv
+__ZNK7WebCore22CloseWorkerGlobalScopeTask13isCleanupTaskEv
+__ZN7WebCore22CloseWorkerGlobalScopeTask11performTaskEPNS_22ScriptExecutionContextE
+__ZThn16_N7WebCore17SharedWorkerProxy19workerGlobalScopeClosedEv
+__ZN7WebCore22CloseWorkerGlobalScopeTaskD0Ev
 __ZNK7WebCore29WorkerThreadShutdownStartTask13isCleanupTaskEv
 __ZNK7WebCore30WorkerThreadShutdownFinishTask13isCleanupTaskEv
 __ZN7WebCore26setJSAbstractWorkerOnerrorEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
-__ZN7WebCore40jsWorkerContextWorkerLocationConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
+__ZN7WebCore40jsWorkerGlobalScopeWorkerLocationConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore16JSWorkerLocation14getConstructorEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE
 __ZN7WebCore17getDOMConstructorINS_27JSWorkerLocationConstructorEEEPN3JSC8JSObjectEPNS2_9ExecStateEPKNS_17JSDOMGlobalObjectE
 __ZN7WebCore27JSWorkerLocationConstructor18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
@@ -26428,31 +26428,31 @@ __ZNK7WebCore14WorkerLocation6searchEv
 __ZN7WebCore20jsWorkerLocationHashEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZNK7WebCore14WorkerLocation4hashEv
 __ZN7WebCore27JSWorkerLocationConstructorD1Ev
-__ZN7WebCore19jsWorkerContextSelfEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
-__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_13WorkerContextE
+__ZN7WebCore19jsWorkerGlobalScopeSelfEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
+__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_13WorkerGlobalScopeE
 __ZN7WebCore24jsWorkerNavigatorAppNameEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore27jsWorkerNavigatorAppVersionEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZNK7WebCore15WorkerNavigator9userAgentEv
 __ZN7WebCore25jsWorkerNavigatorPlatformEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore26jsWorkerNavigatorUserAgentEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore23jsWorkerNavigatorOnLineEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
-__ZN7WebCore41setJSWorkerContextMessageEventConstructorEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
-__ZN7WebCore22setJSWorkerContextSelfEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
-__ZN7WebCore25setJSWorkerContextOnerrorEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
-__ZN7WebCore42jsWorkerContextPrototypeFunctionSetTimeoutEPN3JSC9ExecStateE
-__ZN7WebCore15JSWorkerContext10setTimeoutEPN3JSC9ExecStateE
-__ZN7WebCore13WorkerContext10setTimeoutEN3WTF10PassOwnPtrINS_15ScheduledActionEEEi
-__ZNK7WebCore13WorkerContext22scriptExecutionContextEv
+__ZN7WebCore41setJSWorkerGlobalScopeMessageEventConstructorEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
+__ZN7WebCore22setJSWorkerGlobalScopeSelfEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
+__ZN7WebCore25setJSWorkerGlobalScopeOnerrorEPN3JSC9ExecStateEPNS0_8JSObjectENS0_7JSValueE
+__ZN7WebCore42jsWorkerGlobalScopePrototypeFunctionSetTimeoutEPN3JSC9ExecStateE
+__ZN7WebCore15JSWorkerGlobalScope10setTimeoutEPN3JSC9ExecStateE
+__ZN7WebCore13WorkerGlobalScope10setTimeoutEN3WTF10PassOwnPtrINS_15ScheduledActionEEEi
+__ZNK7WebCore13WorkerGlobalScope22scriptExecutionContextEv
 __ZNK7WebCore22ScriptExecutionContext20minimumTimerIntervalEv
 __ZN7WebCore17WorkerSharedTimer11setFireTimeEd
-__ZN7WebCore15ScheduledAction7executeEPNS_13WorkerContextE
+__ZN7WebCore15ScheduledAction7executeEPNS_13WorkerGlobalScopeE
 __ZN7WebCore17jsWorkerOnmessageEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore34jsWorkerPrototypeFunctionTerminateEPN3JSC9ExecStateE
 __ZN7WebCore6Worker9terminateEv
 __ZN7WebCore22WorkerScriptController15forbidExecutionEv
 __ZN3WTF9HashTableIPN7WebCore11MessagePortES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E16lookupForWritingERKS3_
 __ZN3WTF9HashTableIPN7WebCore11MessagePortES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E4findIS3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEENS_17HashTableIteratorIS3_S3_S5_S7_S9_S9_EERKT_
-__ZThn8_N7WebCore20WorkerMessagingProxy19workerContextClosedEv
+__ZThn8_N7WebCore20WorkerMessagingProxy19workerGlobalScopeClosedEv
 __ZN7WebCore19WorkerTerminateTask11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCore19WorkerTerminateTaskD0Ev
 __ZNK7WebCore22ScriptExecutionContext4Task13isCleanupTaskEv
@@ -26462,22 +26462,22 @@ __ZN7WebCore19WorkerExceptionTask11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCore19WorkerExceptionTaskD0Ev
 __ZThn32_NK7WebCore16SuspendableTimer18hasPendingActivityEv
 __ZN7WebCore21JSWorkerLocationOwner26isReachableFromOpaqueRootsEN3JSC6HandleINS1_7UnknownEEEPvRNS1_9MarkStackE
-__ZN7WebCore40jsWorkerContextMessageChannelConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
-__ZNK7WebCore15JSWorkerContext14messageChannelEPN3JSC9ExecStateE
-__ZN7WebCore48jsWorkerContextPrototypeFunctionAddEventListenerEPN3JSC9ExecStateE
-__ZN7WebCore51jsWorkerContextPrototypeFunctionRemoveEventListenerEPN3JSC9ExecStateE
-__ZN7WebCore45jsWorkerContextPrototypeFunctionDispatchEventEPN3JSC9ExecStateE
-__ZN7WebCore44jsWorkerContextPrototypeFunctionClearTimeoutEPN3JSC9ExecStateE
-__ZN7WebCore13WorkerContext12clearTimeoutEi
-__ZN7WebCore43jsWorkerContextPrototypeFunctionSetIntervalEPN3JSC9ExecStateE
-__ZN7WebCore15JSWorkerContext11setIntervalEPN3JSC9ExecStateE
-__ZN7WebCore13WorkerContext11setIntervalEN3WTF10PassOwnPtrINS_15ScheduledActionEEEi
-__ZN7WebCore45jsWorkerContextPrototypeFunctionClearIntervalEPN3JSC9ExecStateE
-__ZN7WebCore13WorkerContext13clearIntervalEi
-__ZN7WebCore48jsWorkerContextPrototypeFunctionOpenDatabaseSyncEPN3JSC9ExecStateE
-__ZN7WebCore13WorkerContext16openDatabaseSyncERKN3WTF6StringES4_S4_mNS1_10PassRefPtrINS_16DatabaseCallbackEEERi
+__ZN7WebCore40jsWorkerGlobalScopeMessageChannelConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
+__ZNK7WebCore15JSWorkerGlobalScope14messageChannelEPN3JSC9ExecStateE
+__ZN7WebCore48jsWorkerGlobalScopePrototypeFunctionAddEventListenerEPN3JSC9ExecStateE
+__ZN7WebCore51jsWorkerGlobalScopePrototypeFunctionRemoveEventListenerEPN3JSC9ExecStateE
+__ZN7WebCore45jsWorkerGlobalScopePrototypeFunctionDispatchEventEPN3JSC9ExecStateE
+__ZN7WebCore44jsWorkerGlobalScopePrototypeFunctionClearTimeoutEPN3JSC9ExecStateE
+__ZN7WebCore13WorkerGlobalScope12clearTimeoutEi
+__ZN7WebCore43jsWorkerGlobalScopePrototypeFunctionSetIntervalEPN3JSC9ExecStateE
+__ZN7WebCore15JSWorkerGlobalScope11setIntervalEPN3JSC9ExecStateE
+__ZN7WebCore13WorkerGlobalScope11setIntervalEN3WTF10PassOwnPtrINS_15ScheduledActionEEEi
+__ZN7WebCore45jsWorkerGlobalScopePrototypeFunctionClearIntervalEPN3JSC9ExecStateE
+__ZN7WebCore13WorkerGlobalScope13clearIntervalEi
+__ZN7WebCore48jsWorkerGlobalScopePrototypeFunctionOpenDatabaseSyncEPN3JSC9ExecStateE
+__ZN7WebCore13WorkerGlobalScope16openDatabaseSyncERKN3WTF6StringES4_S4_mNS1_10PassRefPtrINS_16DatabaseCallbackEEERi
 __ZN7WebCore12DatabaseSync16openDatabaseSyncEPNS_22ScriptExecutionContextERKN3WTF6StringES6_S6_mNS3_10PassRefPtrINS_16DatabaseCallbackEEERi
-__ZN7WebCore13WorkerContext21databaseExceededQuotaERKN3WTF6StringE
+__ZN7WebCore13WorkerGlobalScope21databaseExceededQuotaERKN3WTF6StringE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DatabaseSyncE
 __ZN7WebCore13createWrapperINS_14JSDatabaseSyncENS_12DatabaseSyncEEEPNS_12JSDOMWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPT0_
 __ZN7WebCore15getDOMStructureINS_14JSDatabaseSyncEEEPN3JSC9StructureEPNS2_9ExecStateEPNS_17JSDOMGlobalObjectE
@@ -26503,7 +26503,7 @@ __ZN7WebCore18SQLTransactionSync6commitEv
 __ZN7WebCore15DatabaseBackend10hadDeletesEv
 __ZN7WebCore15DatabaseBackend18setExpectedVersionERKN3WTF6StringE
 __ZN7WebCore28JSSQLTransactionSyncCallbackD0Ev
-__ZNK7WebCore13WorkerContext15isContextThreadEv
+__ZNK7WebCore13WorkerGlobalScope15isContextThreadEv
 __ZN7WebCore42jsDatabaseSyncPrototypeFunctionTransactionEPN3JSC9ExecStateE
 __ZN7WebCore12DatabaseSync11transactionEN3WTF10PassRefPtrINS_26SQLTransactionSyncCallbackEEERi
 __ZN7WebCore12DatabaseSync14runTransactionEN3WTF10PassRefPtrINS_26SQLTransactionSyncCallbackEEEbRi
@@ -26511,7 +26511,7 @@ __ZN7WebCore29JSSQLTransactionSyncPrototype18getOwnPropertySlotEPN3JSC9ExecState
 __ZN7WebCore47jsSQLTransactionSyncPrototypeFunctionExecuteSqlEPN3JSC9ExecStateE
 __ZN7WebCore20JSSQLTransactionSync10executeSqlEPN3JSC9ExecStateE
 __ZN7WebCore18SQLTransactionSync10executeSQLERKN3WTF6StringERKNS1_6VectorINS_8SQLValueELm0EEERi
-__ZNK7WebCore13WorkerContext19allowDatabaseAccessEv
+__ZNK7WebCore13WorkerGlobalScope19allowDatabaseAccessEv
 __ZN7WebCore16SQLStatementSyncC1ERKN3WTF6StringERKNS1_6VectorINS_8SQLValueELm0EEEi
 __ZN7WebCore16SQLStatementSync7executeEPNS_12DatabaseSyncERi
 __ZNK7WebCore15SQLiteStatement18bindParameterCountEv
@@ -26548,22 +26548,22 @@ __ZN7WebCore19SQLResultSetRowListD1Ev
 __ZN7WebCore23JSDatabaseSyncPrototypeD1Ev
 __ZN7WebCore29JSSQLTransactionSyncPrototypeD1Ev
 __ZN7WebCore23JSSQLResultSetPrototypeD1Ev
-__ZN7WebCore45jsWorkerContextPrototypeFunctionImportScriptsEPN3JSC9ExecStateE
-__ZN7WebCore15JSWorkerContext13importScriptsEPN3JSC9ExecStateE
-__ZN7WebCore22DedicatedWorkerContext13importScriptsERKN3WTF6VectorINS1_6StringELm0EEERi
-__ZN7WebCore13WorkerContext13importScriptsERKN3WTF6VectorINS1_6StringELm0EEERi
+__ZN7WebCore45jsWorkerGlobalScopePrototypeFunctionImportScriptsEPN3JSC9ExecStateE
+__ZN7WebCore15JSWorkerGlobalScope13importScriptsEPN3JSC9ExecStateE
+__ZN7WebCore22DedicatedWorkerGlobalScope13importScriptsERKN3WTF6VectorINS1_6StringELm0EEERi
+__ZN7WebCore13WorkerGlobalScope13importScriptsERKN3WTF6VectorINS1_6StringELm0EEERi
 __ZN3WTF6VectorIN7WebCore4KURLELm0EE15reserveCapacityEm
 __ZN3WTF11VectorMoverILb0EN7WebCore4KURLEE4moveEPKS2_S5_PS2_
 __ZN7WebCore18WorkerScriptLoader17loadSynchronouslyEPNS_22ScriptExecutionContextERKNS_4KURLENS_24CrossOriginRequestPolicyE
-__ZN7WebCore22WorkerThreadableLoader25loadResourceSynchronouslyEPNS_13WorkerContextERKNS_15ResourceRequestERNS_22ThreadableLoaderClientERKNS_23ThreadableLoaderOptionsE
-__ZN7WebCore22WorkerThreadableLoaderC2EPNS_13WorkerContextEPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_15ResourceRequestERKNS_23ThreadableLoaderOptionsE
+__ZN7WebCore22WorkerThreadableLoader25loadResourceSynchronouslyEPNS_13WorkerGlobalScopeERKNS_15ResourceRequestERNS_22ThreadableLoaderClientERKNS_23ThreadableLoaderOptionsE
+__ZN7WebCore22WorkerThreadableLoaderC2EPNS_13WorkerGlobalScopeEPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_15ResourceRequestERKNS_23ThreadableLoaderOptionsE
 __ZN7WebCore22WorkerThreadableLoader16MainThreadBridgeC2EN3WTF10PassRefPtrINS_29ThreadableLoaderClientWrapperEEERNS_17WorkerLoaderProxyERKNS2_6StringERKNS_15ResourceRequestERKNS_23ThreadableLoaderOptionsESA_
 __ZN7WebCore18createCallbackTaskINS_29AllowCrossThreadAccessWrapperINS_22WorkerThreadableLoader16MainThreadBridgeEEEPS3_NS_15ResourceRequestEN3WTF10PassOwnPtrINS_30CrossThreadResourceRequestDataEEENS_23ThreadableLoaderOptionsESB_NS7_6StringERKSC_EENS8_INS_22ScriptExecutionContext4TaskEEEPFvPSF_T0_T2_T4_T6_ERKT_RKT1_RKT3_RKT5_
 __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_15ResourceRequestEE4copyERKS1_
 __ZNK7WebCore19ResourceRequestBase8copyDataEv
 __ZNK7WebCore13HTTPHeaderMap8copyDataEv
 __ZThn16_N7WebCore20WorkerMessagingProxy16postTaskToLoaderEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4TaskEEE
-__ZN7WebCore13WorkerRunLoop9runInModeEPNS_13WorkerContextERKN3WTF6StringE
+__ZN7WebCore13WorkerRunLoop9runInModeEPNS_13WorkerGlobalScopeERKN3WTF6StringE
 __ZN7WebCore22WorkerThreadableLoader16MainThreadBridge22mainThreadCreateLoaderEPNS_22ScriptExecutionContextEPS1_N3WTF10PassOwnPtrINS_30CrossThreadResourceRequestDataEEENS_23ThreadableLoaderOptionsERKNS5_6StringE
 __ZN7WebCore19ResourceRequestBase5adoptEN3WTF10PassOwnPtrINS_30CrossThreadResourceRequestDataEEE
 __ZN7WebCore13HTTPHeaderMap5adoptEN3WTF10PassOwnPtrINS1_6VectorISt4pairINS1_6StringES5_ELm0EEEEE
@@ -26572,15 +26572,15 @@ __ZN7WebCore22WorkerThreadableLoader16MainThreadBridge18didReceiveResponseERKNS_
 __ZN7WebCore18createCallbackTaskIN3WTF6RefPtrINS_29ThreadableLoaderClientWrapperEEES4_NS_16ResourceResponseENS1_10PassOwnPtrINS_31CrossThreadResourceResponseDataEEEEENS6_INS_22ScriptExecutionContext4TaskEEEPFvPS9_T0_T2_ERKT_RKT1_
 __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_16ResourceResponseEE4copyERKS1_
 __ZNK7WebCore20ResourceResponseBase8copyDataEv
-__ZThn16_N7WebCore20WorkerMessagingProxy30postTaskForModeToWorkerContextEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4TaskEEERKNS1_6StringE
-__ZN7WebCoreL31workerContextDidReceiveResponseEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_29ThreadableLoaderClientWrapperEEENS2_10PassOwnPtrINS_31CrossThreadResourceResponseDataEEE
+__ZThn16_N7WebCore20WorkerMessagingProxy30postTaskForModeToWorkerGlobalScopeEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4TaskEEERKNS1_6StringE
+__ZN7WebCoreL31workerGlobalScopeDidReceiveResponseEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_29ThreadableLoaderClientWrapperEEENS2_10PassOwnPtrINS_31CrossThreadResourceResponseDataEEE
 __ZN7WebCore20ResourceResponseBase5adoptEN3WTF10PassOwnPtrINS_31CrossThreadResourceResponseDataEEE
 __ZN7WebCore35CrossThreadResourceResponseDataBaseD2Ev
 __ZN7WebCore22WorkerThreadableLoader16MainThreadBridge14didReceiveDataEPKci
 __ZN7WebCore22WorkerThreadableLoader16MainThreadBridge16didFinishLoadingEmd
-__ZN7WebCoreL27workerContextDidReceiveDataEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_29ThreadableLoaderClientWrapperEEENS2_10PassOwnPtrINS2_6VectorIcLm0EEEEE
+__ZN7WebCoreL27workerGlobalScopeDidReceiveDataEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_29ThreadableLoaderClientWrapperEEENS2_10PassOwnPtrINS2_6VectorIcLm0EEEEE
 __ZN7WebCore16CrossThreadTask3IN3WTF10PassRefPtrINS_29ThreadableLoaderClientWrapperEEENS1_6RefPtrIS3_EEmmddE11performTaskEPNS_22ScriptExecutionContextE
-__ZN7WebCoreL29workerContextDidFinishLoadingEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_29ThreadableLoaderClientWrapperEEEmd
+__ZN7WebCoreL29workerGlobalScopeDidFinishLoadingEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_29ThreadableLoaderClientWrapperEEEmd
 __ZN7WebCore16CrossThreadTask3IN3WTF10PassRefPtrINS_29ThreadableLoaderClientWrapperEEENS1_6RefPtrIS3_EEmmddED0Ev
 __ZN7WebCore22WorkerThreadableLoaderD0Ev
 __ZNK7WebCore18WorkerScriptLoader11responseURLEv
@@ -26589,8 +26589,8 @@ __ZN7WebCore22WorkerThreadableLoader16MainThreadBridge17mainThreadDestroyEPNS_22
 __ZN7WebCore22WorkerThreadableLoader16MainThreadBridgeD0Ev
 __ZN7WebCore16CrossThreadTask1IPNS_22WorkerThreadableLoader16MainThreadBridgeES3_ED0Ev
 __ZN7WebCore18WorkerScriptLoaderD2Ev
-__ZN7WebCore44jsWorkerContextPrototypeFunctionOpenDatabaseEPN3JSC9ExecStateE
-__ZN7WebCore13WorkerContext12openDatabaseERKN3WTF6StringES4_S4_mNS1_10PassRefPtrINS_16DatabaseCallbackEEERi
+__ZN7WebCore44jsWorkerGlobalScopePrototypeFunctionOpenDatabaseEPN3JSC9ExecStateE
+__ZN7WebCore13WorkerGlobalScope12openDatabaseERKN3WTF6StringES4_S4_mNS1_10PassRefPtrINS_16DatabaseCallbackEEERi
 __ZN7WebCore17jsDatabaseVersionEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZNK7WebCore8Database7versionEv
 __ZN7WebCore40jsDatabasePrototypeFunctionChangeVersionEPN3JSC9ExecStateE
@@ -31197,10 +31197,10 @@ __ZN7WebCore11EventSource19reconnectTimerFiredEPNS_5TimerIS0_EE
 __ZThn16_N7WebCore24DocumentThreadableLoader15willSendRequestEPNS_17SubresourceLoaderERNS_15ResourceRequestERKNS_16ResourceResponseE
 __ZN7WebCore24DocumentThreadableLoader15willSendRequestEPNS_17SubresourceLoaderERNS_15ResourceRequestERKNS_16ResourceResponseE
 __ZN7WebCore22ThreadableLoaderClient32isDocumentThreadableLoaderClientEv
-__ZN7WebCore37jsWorkerContextEventSourceConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
-__ZNK7WebCore15JSWorkerContext11eventSourceEPN3JSC9ExecStateE
+__ZN7WebCore37jsWorkerGlobalScopeEventSourceConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
+__ZNK7WebCore15JSWorkerGlobalScope11eventSourceEPN3JSC9ExecStateE
 __ZN7WebCore13WorkerRunLoop11defaultModeEv
-__ZN7WebCore22WorkerThreadableLoaderC1EPNS_13WorkerContextEPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_15ResourceRequestERKNS_23ThreadableLoaderOptionsE
+__ZN7WebCore22WorkerThreadableLoaderC1EPNS_13WorkerGlobalScopeEPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_15ResourceRequestERKNS_23ThreadableLoaderOptionsE
 __ZN7WebCore22WorkerThreadableLoader6cancelEv
 __ZN7WebCore22WorkerThreadableLoader16MainThreadBridge6cancelEv
 __ZN7WebCore22WorkerThreadableLoader16MainThreadBridge16mainThreadCancelEPNS_22ScriptExecutionContextEPS1_
@@ -31259,7 +31259,7 @@ __ZN7WebCore9WebSocket14refEventTargetEv
 __ZNK7WebCore10CloseEvent12isCloseEventEv
 __ZN7WebCore13createWrapperINS_12JSCloseEventENS_10CloseEventEEEPNS_12JSDOMWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPT0_
 __ZN7WebCore12JSCloseEventC1EPN3JSC9StructureEPNS_17JSDOMGlobalObjectEN3WTF10PassRefPtrINS_10CloseEventEEE
-__ZN7WebCore11EventTarget21toSharedWorkerContextEv
+__ZN7WebCore11EventTarget21toSharedWorkerGlobalScopeEv
 __ZN7WebCore9WebSocket11toWebSocketEv
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_9WebSocketE
 __ZN7WebCore4wrapINS_11JSWebSocketENS_9WebSocketEEEN3JSC7JSValueEPNS3_9ExecStateEPNS_17JSDOMGlobalObjectEPT0_
@@ -31514,12 +31514,12 @@ __ZNK7WebCore9WebSocket3urlEv
 __ZN7WebCore44jsWebSocketPrototypeFunctionAddEventListenerEPN3JSC9ExecStateE
 __ZN7WebCore41jsWebSocketPrototypeFunctionDispatchEventEPN3JSC9ExecStateE
 __ZN7WebCore47jsWebSocketPrototypeFunctionRemoveEventListenerEPN3JSC9ExecStateE
-__ZNK7WebCore15JSWorkerContext9webSocketEPN3JSC9ExecStateE
-__ZN7WebCore32WorkerThreadableWebSocketChannelC1EPNS_13WorkerContextEPNS_22WebSocketChannelClientERKN3WTF6StringERKNS_4KURLES8_
-__ZN7WebCore32WorkerThreadableWebSocketChannelC2EPNS_13WorkerContextEPNS_22WebSocketChannelClientERKN3WTF6StringERKNS_4KURLES8_
+__ZNK7WebCore15JSWorkerGlobalScope9webSocketEPN3JSC9ExecStateE
+__ZN7WebCore32WorkerThreadableWebSocketChannelC1EPNS_13WorkerGlobalScopeEPNS_22WebSocketChannelClientERKN3WTF6StringERKNS_4KURLES8_
+__ZN7WebCore32WorkerThreadableWebSocketChannelC2EPNS_13WorkerGlobalScopeEPNS_22WebSocketChannelClientERKN3WTF6StringERKNS_4KURLES8_
 __ZN7WebCore39ThreadableWebSocketChannelClientWrapper6createEPNS_22WebSocketChannelClientE
-__ZN7WebCore32WorkerThreadableWebSocketChannel6Bridge6createEN3WTF10PassRefPtrINS_39ThreadableWebSocketChannelClientWrapperEEENS3_INS_13WorkerContextEEERKNS2_6StringERKNS_4KURLESA_
-__ZN7WebCore32WorkerThreadableWebSocketChannel6BridgeC2EN3WTF10PassRefPtrINS_39ThreadableWebSocketChannelClientWrapperEEENS3_INS_13WorkerContextEEERKNS2_6StringERKNS_4KURLESA_
+__ZN7WebCore32WorkerThreadableWebSocketChannel6Bridge6createEN3WTF10PassRefPtrINS_39ThreadableWebSocketChannelClientWrapperEEENS3_INS_13WorkerGlobalScopeEEERKNS2_6StringERKNS_4KURLESA_
+__ZN7WebCore32WorkerThreadableWebSocketChannel6BridgeC2EN3WTF10PassRefPtrINS_39ThreadableWebSocketChannelClientWrapperEEENS3_INS_13WorkerGlobalScopeEEERKNS2_6StringERKNS_4KURLESA_
 __ZN7WebCore39ThreadableWebSocketChannelClientWrapper19clearSyncMethodDoneEv
 __ZN7WebCore18createCallbackTaskINS_29AllowCrossThreadAccessWrapperINS_32WorkerThreadableWebSocketChannel6BridgeEEEPS3_N3WTF6RefPtrINS_39ThreadableWebSocketChannelClientWrapperEEES9_NS6_6StringERKSA_NS_4KURLERKSD_SA_SC_EENS6_10PassOwnPtrINS_22ScriptExecutionContext4TaskEEEPFvPSH_T0_T2_T4_T6_T8_ERKT_RKT1_RKT3_RKT5_RKT7_
 __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_4KURLEE4copyERKS1_
@@ -31540,7 +31540,7 @@ __ZN7WebCore32WorkerThreadableWebSocketChannel17mainThreadConnectEPNS_22ScriptEx
 __ZN7WebCore16CrossThreadTask1IPNS_32WorkerThreadableWebSocketChannel4PeerES3_ED0Ev
 __ZN7WebCore32WorkerThreadableWebSocketChannel4Peer8didCloseEm
 __ZN7WebCore16CrossThreadTask2IN3WTF10PassRefPtrINS_39ThreadableWebSocketChannelClientWrapperEEENS1_6RefPtrIS3_EEmmE11performTaskEPNS_22ScriptExecutionContextE
-__ZN7WebCoreL21workerContextDidCloseEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_39ThreadableWebSocketChannelClientWrapperEEEm
+__ZN7WebCoreL21workerGlobalScopeDidCloseEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_39ThreadableWebSocketChannelClientWrapperEEEm
 __ZN7WebCore39ThreadableWebSocketChannelClientWrapper8didCloseEm
 __ZN7WebCore39ThreadableWebSocketChannelClientWrapper20processPendingEventsEv
 __ZN7WebCore32WorkerThreadableWebSocketChannel10disconnectEv
@@ -31553,11 +31553,11 @@ __ZN7WebCore16CrossThreadTask2IN3WTF10PassRefPtrINS_39ThreadableWebSocketChannel
 __ZN7WebCore32WorkerThreadableWebSocketChannel17mainThreadDestroyEPNS_22ScriptExecutionContextEPNS0_4PeerE
 __ZN7WebCore32WorkerThreadableWebSocketChannel4PeerD0Ev
 __ZN7WebCore17SharedWorkerProxy16postTaskToLoaderEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4TaskEEE
-__ZN7WebCore17SharedWorkerProxy30postTaskForModeToWorkerContextEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4TaskEEERKNS1_6StringE
+__ZN7WebCore17SharedWorkerProxy30postTaskForModeToWorkerGlobalScopeEN3WTF10PassOwnPtrINS_22ScriptExecutionContext4TaskEEERKNS1_6StringE
 __ZN7WebCore22WorkerScriptController12setExceptionENS_11ScriptValueE
 __ZN7WebCore18WorkerScriptLoader20didFailRedirectCheckEv
-__ZN7WebCore40jsWorkerContextXMLHttpRequestConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
-__ZNK7WebCore15JSWorkerContext14xmlHttpRequestEPN3JSC9ExecStateE
+__ZN7WebCore40jsWorkerGlobalScopeXMLHttpRequestConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
+__ZNK7WebCore15JSWorkerGlobalScope14xmlHttpRequestEPN3JSC9ExecStateE
 __ZN7WebCoreL20getJSErrorEventTableEPN3JSC9ExecStateE
 __ZN7WebCoreL29getJSErrorEventPrototypeTableEPN3JSC9ExecStateE
 __ZN7WebCore36jsXMLHttpRequestExceptionConstructorEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
@@ -31599,7 +31599,7 @@ __ZN7WebCore16CrossThreadTask2IN3WTF10PassRefPtrINS_29ThreadableLoaderClientWrap
 __ZN7WebCore16CrossThreadTask2IN3WTF10PassRefPtrINS_29ThreadableLoaderClientWrapperEEENS1_6RefPtrIS3_EENS_13ResourceErrorERKS7_EC2EPFvPNS_22ScriptExecutionContextES6_S9_ES4_S9_
 __ZN7WebCore16CrossThreadTask2IN3WTF10PassRefPtrINS_29ThreadableLoaderClientWrapperEEENS1_6RefPtrIS3_EENS_13ResourceErrorERKS7_ED0Ev
 __ZN7WebCore16CrossThreadTask2IN3WTF10PassRefPtrINS_29ThreadableLoaderClientWrapperEEENS1_6RefPtrIS3_EENS_13ResourceErrorERKS7_ED1Ev
-__ZN7WebCoreL20workerContextDidFailEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_29ThreadableLoaderClientWrapperEEERKNS_13ResourceErrorE
+__ZN7WebCoreL20workerGlobalScopeDidFailEPNS_22ScriptExecutionContextEN3WTF6RefPtrINS_29ThreadableLoaderClientWrapperEEERKNS_13ResourceErrorE
 __ZN7WebCore13PowerObserver33didReceiveSystemPowerNotificationEPvjjS1_
 ___didReceiveSystemPowerNotification_block_invoke_1
 __ZN7WebCore13PowerObserver18restartSharedTimerEv
@@ -32637,7 +32637,7 @@ __ZTVN7WebCore8Database22DatabaseTableNamesTaskE
 __ZTVN7WebCore19DatasetDOMStringMapE
 __ZTVN7WebCore8DataViewE
 __ZTVN7WebCore25DecodedDataDocumentParserE
-__ZTVN7WebCore22DedicatedWorkerContextE
+__ZTVN7WebCore22DedicatedWorkerGlobalScopeE
 __ZTVN7WebCore21DedicatedWorkerThreadE
 __ZTVN7WebCore27DefaultAudioDestinationNodeE
 __ZTVN7WebCore17SharedWorkerProxyE
@@ -33190,10 +33190,10 @@ __ZN7WebCore19JSDataViewPrototype6s_infoE
 __ZN7WebCore10JSDataView6s_infoE
 __ZN7WebCoreL21JSDataViewTableValuesE
 __ZN7WebCoreL30JSDataViewPrototypeTableValuesE
-__ZN7WebCore33JSDedicatedWorkerContextPrototype6s_infoE
-__ZN7WebCore24JSDedicatedWorkerContext6s_infoE
-__ZN7WebCoreL35JSDedicatedWorkerContextTableValuesE
-__ZN7WebCoreL44JSDedicatedWorkerContextPrototypeTableValuesE
+__ZN7WebCore33JSDedicatedWorkerGlobalScopePrototype6s_infoE
+__ZN7WebCore24JSDedicatedWorkerGlobalScope6s_infoE
+__ZN7WebCoreL35JSDedicatedWorkerGlobalScopeTableValuesE
+__ZN7WebCoreL44JSDedicatedWorkerGlobalScopePrototypeTableValuesE
 __ZN7WebCore22JSDelayNodeConstructor6s_infoE
 __ZN7WebCore20JSDelayNodePrototype6s_infoE
 __ZN7WebCore11JSDelayNode6s_infoE
@@ -34060,9 +34060,9 @@ __ZN7WebCore23JSSharedWorkerPrototype6s_infoE
 __ZN7WebCore14JSSharedWorker6s_infoE
 __ZTVN7WebCore19JSSharedWorkerOwnerE
 __ZN7WebCoreL25JSSharedWorkerTableValuesE
-__ZN7WebCore30JSSharedWorkerContextPrototype6s_infoE
-__ZN7WebCore21JSSharedWorkerContext6s_infoE
-__ZN7WebCoreL32JSSharedWorkerContextTableValuesE
+__ZN7WebCore30JSSharedWorkerGlobalScopePrototype6s_infoE
+__ZN7WebCore21JSSharedWorkerGlobalScope6s_infoE
+__ZN7WebCoreL32JSSharedWorkerGlobalScopeTableValuesE
 __ZN7WebCore19JSSQLErrorPrototype6s_infoE
 __ZN7WebCore10JSSQLError6s_infoE
 __ZTVN7WebCore15JSSQLErrorOwnerE
@@ -35064,11 +35064,11 @@ __ZN7WebCore8JSWorker6s_infoE
 __ZTVN7WebCore13JSWorkerOwnerE
 __ZN7WebCoreL19JSWorkerTableValuesE
 __ZN7WebCoreL28JSWorkerPrototypeTableValuesE
-__ZN7WebCore24JSWorkerContextPrototype6s_infoE
-__ZN7WebCore15JSWorkerContext6s_infoE
-__ZN7WebCoreL26JSWorkerContextTableValuesE
-__ZN7WebCoreL35JSWorkerContextPrototypeTableValuesE
-__ZN7WebCore19JSWorkerContextBase6s_infoE
+__ZN7WebCore24JSWorkerGlobalScopePrototype6s_infoE
+__ZN7WebCore15JSWorkerGlobalScope6s_infoE
+__ZN7WebCoreL26JSWorkerGlobalScopeTableValuesE
+__ZN7WebCoreL35JSWorkerGlobalScopePrototypeTableValuesE
+__ZN7WebCore19JSWorkerGlobalScopeBase6s_infoE
 __ZN7WebCore27JSWorkerLocationConstructor6s_infoE
 __ZN7WebCore25JSWorkerLocationPrototype6s_infoE
 __ZN7WebCore16JSWorkerLocation6s_infoE
@@ -35477,7 +35477,7 @@ __ZTVN7WebCore23SetNodeAttributeCommandE
 __ZTVN7WebCore19SetSelectionCommandE
 __ZTVN7WebCore10ShadowRootE
 __ZTVN7WebCore12SharedWorkerE
-__ZTVN7WebCore19SharedWorkerContextE
+__ZTVN7WebCore19SharedWorkerGlobalScopeE
 __ZTVN7WebCore18SharedWorkerThreadE
 __ZTVN7WebCore14SimpleFontDataE
 __ZTVN7WebCore21SimplifyMarkupCommandE
@@ -35781,8 +35781,8 @@ __ZTVN7WebCore26WheelEventDispatchMediatorE
 __ZTVN7WebCore6WidgetE
 __ZTVN7WebCore6WorkerE
 __ZTVN7WebCore18WorkerConsoleAgentE
-__ZTVN7WebCore13WorkerContextE
-__ZTVN7WebCore26WorkerContextNotificationsE
+__ZTVN7WebCore13WorkerGlobalScopeE
+__ZTVN7WebCore26WorkerGlobalScopeNotificationsE
 __ZTVN7WebCore19WorkerDebuggerAgentE
 __ZTVN7WebCore12_GLOBAL__N_124RunInspectorCommandsTaskE
 __ZTVN7WebCore16WorkerEventQueueE
@@ -36608,8 +36608,8 @@ __ZN7WebCoreL15JSDataViewTableE
 __ZN7WebCoreL24JSDataViewPrototypeTableE
 __ZN7WebCoreL26JSDataViewConstructorTableE
 __ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPN3WTF15ArrayBufferViewEE22jsArrayBufferViewOwner
-__ZN7WebCoreL29JSDedicatedWorkerContextTableE
-__ZN7WebCoreL38JSDedicatedWorkerContextPrototypeTableE
+__ZN7WebCoreL29JSDedicatedWorkerGlobalScopeTableE
+__ZN7WebCoreL38JSDedicatedWorkerGlobalScopePrototypeTableE
 __ZN7WebCoreL27JSDelayNodeConstructorTableE
 __ZN7WebCoreL25JSDelayNodePrototypeTableE
 __ZN7WebCoreL16JSDelayNodeTableE
@@ -37173,8 +37173,8 @@ __ZN7WebCoreL28JSSharedWorkerPrototypeTableE
 __ZN7WebCoreL19JSSharedWorkerTableE
 __ZZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_12SharedWorkerEE19jsSharedWorkerOwner
 __ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_12SharedWorkerEE19jsSharedWorkerOwner
-__ZN7WebCoreL26JSSharedWorkerContextTableE
-__ZN7WebCoreL35JSSharedWorkerContextPrototypeTableE
+__ZN7WebCoreL26JSSharedWorkerGlobalScopeTableE
+__ZN7WebCoreL35JSSharedWorkerGlobalScopePrototypeTableE
 __ZN7WebCoreL15JSSQLErrorTableE
 __ZN7WebCoreL24JSSQLErrorPrototypeTableE
 __ZZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_8SQLErrorEE15jsSQLErrorOwner
@@ -37902,8 +37902,8 @@ __ZN7WebCoreL22JSWorkerPrototypeTableE
 __ZN7WebCoreL13JSWorkerTableE
 __ZZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_6WorkerEE13jsWorkerOwner
 __ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_6WorkerEE13jsWorkerOwner
-__ZN7WebCoreL20JSWorkerContextTableE
-__ZN7WebCoreL29JSWorkerContextPrototypeTableE
+__ZN7WebCoreL20JSWorkerGlobalScopeTableE
+__ZN7WebCoreL29JSWorkerGlobalScopePrototypeTableE
 __ZN7WebCoreL21JSWorkerLocationTableE
 __ZN7WebCoreL30JSWorkerLocationPrototypeTableE
 __ZN7WebCoreL32JSWorkerLocationConstructorTableE
@@ -38436,7 +38436,7 @@ __ZZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIterato
 __ZGVZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferEE22expandAroundIdeographs
 __ZZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferEE22expandAroundIdeographs
 __ZGVZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferEE22expandAroundIdeographs
-__ZTVN7WebCore22CloseWorkerContextTaskE
+__ZTVN7WebCore22CloseWorkerGlobalScopeTaskE
 __ZN7WebCore19WorkerDebuggerAgent16debuggerTaskModeE
 __ZTVN7WebCore16WorkerEventQueue19EventDispatcherTaskE
 __ZTVN7WebCore16CrossThreadTask1IbbEE
@@ -38445,9 +38445,9 @@ __ZTVN7WebCore16CrossThreadTask6IPNS_20WorkerMessagingProxyES2_NS_13MessageSourc
 __ZTVN7WebCore30WorkerThreadActivityReportTaskE
 __ZTVN7WebCore30PostMessageToPageInspectorTaskE
 __ZTVN7WebCore19WorkerTerminateTaskE
-__ZTVN7WebCore26WorkerContextDestroyedTaskE
+__ZTVN7WebCore26WorkerGlobalScopeDestroyedTaskE
 __ZTVN7WebCore19WorkerExceptionTaskE
-__ZTVN7WebCore24MessageWorkerContextTaskE
+__ZTVN7WebCore24MessageWorkerGlobalScopeTaskE
 __ZTVN7WebCore17MessageWorkerTaskE
 __ZTVN7WebCore17WorkerSharedTimerE
 __ZTVN7WebCore29WorkerThreadShutdownStartTaskE
@@ -38471,7 +38471,7 @@ __ZTVN7WebCore16CrossThreadTask3IPNS_17WorkerLoaderProxyES2_N3WTF10PassRefPtrINS
 __ZTVN7WebCore16CrossThreadTask1IN3WTF10PassOwnPtrINS_32WorkerThreadableWebSocketChannel4PeerEEES5_EE
 __ZTVN7WebCore16CrossThreadTask3IN3WTF10PassRefPtrINS_39ThreadableWebSocketChannelClientWrapperEEES4_NS1_6StringERKS5_S5_S7_EE
 __ZTVN7WebCore16CrossThreadTask2IN3WTF10PassRefPtrINS_39ThreadableWebSocketChannelClientWrapperEEES4_NS_26ThreadableWebSocketChannel10SendResultES6_EE
-__ZTVN7WebCore32WorkerThreadableWebSocketChannel30WorkerContextDidInitializeTaskE
+__ZTVN7WebCore32WorkerThreadableWebSocketChannel30WorkerGlobalScopeDidInitializeTaskE
 __ZZN7WebCore10XLinkNames13getXLinkAttrsEvE9XLinkAttr
 __ZTVN7WebCore16PendingCallbacks29PendingInternalSubsetCallbackE
 __ZTVN7WebCore16PendingCallbacks22PendingCommentCallbackE
index 4edb3c1..d5b0a78 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDedicatedWorkerContext.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDedicatedWorkerGlobalScope.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorkerContext.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorkerGlobalScope.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerContext.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerGlobalScope.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     <ClCompile Include="..\Modules\filesystem\FileWriterBase.cpp" />
     <ClCompile Include="..\Modules\filesystem\FileWriterSync.cpp" />
     <ClCompile Include="..\Modules\filesystem\LocalFileSystem.cpp" />
-    <ClCompile Include="..\Modules\filesystem\WorkerContextFileSystem.cpp" />
+    <ClCompile Include="..\Modules\filesystem\WorkerGlobalScopeFileSystem.cpp" />
     <ClCompile Include="..\Modules\geolocation\Coordinates.cpp" />
     <ClCompile Include="..\Modules\geolocation\Geolocation.cpp" />
     <ClCompile Include="..\Modules\geolocation\GeolocationController.cpp" />
     <ClCompile Include="..\Modules\indexeddb\IDBRequest.cpp" />
     <ClCompile Include="..\Modules\indexeddb\IDBTransaction.cpp" />
     <ClCompile Include="..\Modules\indexeddb\PageGroupIndexedDatabase.cpp" />
-    <ClCompile Include="..\Modules\indexeddb\WorkerContextIndexedDatabase.cpp" />
+    <ClCompile Include="..\Modules\indexeddb\WorkerGlobalScopeIndexedDatabase.cpp" />
     <ClCompile Include="..\Modules\navigatorcontentutils\NavigatorContentUtils.cpp" />
     <ClCompile Include="..\Modules\proximity\DeviceProximityController.cpp" />
     <ClCompile Include="..\Modules\proximity\DeviceProximityEvent.cpp" />
     <ClCompile Include="..\Modules\notifications\DOMWindowNotifications.cpp" />
     <ClCompile Include="..\Modules\notifications\Notification.cpp" />
     <ClCompile Include="..\Modules\notifications\NotificationCenter.cpp" />
-    <ClCompile Include="..\Modules\notifications\WorkerContextNotifications.cpp" />
+    <ClCompile Include="..\Modules\notifications\WorkerGlobalScopeNotifications.cpp" />
     <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp" />
     <ClCompile Include="..\Modules\webdatabase\Database.cpp" />
     <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp" />
     <ClCompile Include="..\Modules\webdatabase\SQLTransactionCoordinator.cpp" />
     <ClCompile Include="..\Modules\webdatabase\SQLTransactionStateMachine.cpp" />
     <ClCompile Include="..\Modules\webdatabase\SQLTransactionSync.cpp" />
-    <ClCompile Include="..\Modules\webdatabase\WorkerContextWebDatabase.cpp" />
+    <ClCompile Include="..\Modules\webdatabase\WorkerGlobalScopeWebDatabase.cpp" />
     <ClCompile Include="..\Modules\websockets\ThreadableWebSocketChannel.cpp" />
     <ClCompile Include="..\Modules\websockets\ThreadableWebSocketChannelClientWrapper.cpp" />
     <ClCompile Include="..\Modules\websockets\WebSocket.cpp" />
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\workers\AbstractWorker.cpp" />
-    <ClCompile Include="..\workers\DedicatedWorkerContext.cpp" />
+    <ClCompile Include="..\workers\DedicatedWorkerGlobalScope.cpp" />
     <ClCompile Include="..\workers\DedicatedWorkerThread.cpp" />
     <ClCompile Include="..\workers\DefaultSharedWorkerRepository.cpp" />
     <ClCompile Include="..\workers\SharedWorker.cpp" />
-    <ClCompile Include="..\workers\SharedWorkerContext.cpp" />
+    <ClCompile Include="..\workers\SharedWorkerGlobalScope.cpp" />
     <ClCompile Include="..\workers\SharedWorkerThread.cpp" />
     <ClCompile Include="..\workers\Worker.cpp" />
-    <ClCompile Include="..\workers\WorkerContext.cpp" />
+    <ClCompile Include="..\workers\WorkerGlobalScope.cpp" />
     <ClCompile Include="..\workers\WorkerEventQueue.cpp" />
     <ClCompile Include="..\workers\WorkerLocation.cpp" />
     <ClCompile Include="..\workers\WorkerMessagingProxy.cpp" />
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\JSDedicatedWorkerContextCustom.cpp">
+    <ClCompile Include="..\bindings\js\JSDedicatedWorkerGlobalScopeCustom.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\JSWorkerContextBase.cpp">
+    <ClCompile Include="..\bindings\js\JSWorkerGlobalScopeBase.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\JSWorkerContextCustom.cpp">
+    <ClCompile Include="..\bindings\js\JSWorkerGlobalScopeCustom.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSDatabaseSync.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSDataTransferItem.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSDataTransferItemList.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDedicatedWorkerContext.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDedicatedWorkerGlobalScope.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDeviceMotionEvent.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDeviceOrientationEvent.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSDirectoryEntry.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSScreen.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSShadowRoot.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorker.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorkerContext.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorkerGlobalScope.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSQLError.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSQLResultSet.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSQLResultSetRowList.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWebSocket.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSWheelEvent.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorker.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerContext.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerGlobalScope.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerLocation.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerNavigator.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSXMLHttpRequest.h" />
     <ClInclude Include="..\Modules\filesystem\Metadata.h" />
     <ClInclude Include="..\Modules\filesystem\MetadataCallback.h" />
     <ClInclude Include="..\Modules\filesystem\SyncCallbackHelper.h" />
-    <ClInclude Include="..\Modules\filesystem\WorkerContextFileSystem.h" />
+    <ClInclude Include="..\Modules\filesystem\WorkerGlobalScopeFileSystem.h" />
     <ClInclude Include="..\Modules\geolocation\Coordinates.h" />
     <ClInclude Include="..\Modules\geolocation\Geolocation.h" />
     <ClInclude Include="..\Modules\geolocation\GeolocationClient.h" />
     <ClInclude Include="..\Modules\indexeddb\IDBRequest.h" />
     <ClInclude Include="..\Modules\indexeddb\IDBTransaction.h" />
     <ClInclude Include="..\Modules\indexeddb\PageGroupIndexedDatabase.h" />
-    <ClInclude Include="..\Modules\indexeddb\WorkerContextIndexedDatabase.h" />
+    <ClInclude Include="..\Modules\indexeddb\WorkerGlobalScopeIndexedDatabase.h" />
     <ClInclude Include="..\Modules\navigatorcontentutils\NavigatorContentUtils.h" />
     <ClInclude Include="..\Modules\proximity\DeviceProximityClient.h" />
     <ClInclude Include="..\Modules\proximity\DeviceProximityController.h" />
     <ClInclude Include="..\Modules\notifications\Notification.h" />
     <ClInclude Include="..\Modules\notifications\NotificationCenter.h" />
     <ClInclude Include="..\Modules\notifications\NotificationClient.h" />
-    <ClInclude Include="..\Modules\notifications\WorkerContextNotifications.h" />
+    <ClInclude Include="..\Modules\notifications\WorkerGlobalScopeNotifications.h" />
     <ClInclude Include="..\Modules\webdatabase\AbstractDatabaseServer.h" />
     <ClInclude Include="..\Modules\webdatabase\AbstractSQLStatement.h" />
     <ClInclude Include="..\Modules\webdatabase\AbstractSQLStatementBackend.h" />
     <ClInclude Include="..\Modules\webdatabase\SQLTransactionStateMachine.h" />
     <ClInclude Include="..\Modules\webdatabase\SQLTransactionSync.h" />
     <ClInclude Include="..\Modules\webdatabase\SQLTransactionSyncCallback.h" />
-    <ClInclude Include="..\Modules\webdatabase\WorkerContextWebDatabase.h" />
+    <ClInclude Include="..\Modules\webdatabase\WorkerGlobalScopeWebDatabase.h" />
     <ClInclude Include="..\Modules\websockets\CloseEvent.h" />
     <ClInclude Include="..\Modules\websockets\ThreadableWebSocketChannel.h" />
     <ClInclude Include="..\Modules\websockets\ThreadableWebSocketChannelClientWrapper.h" />
     <ClInclude Include="..\dom\WheelEvent.h" />
     <ClInclude Include="..\dom\WindowEventContext.h" />
     <ClInclude Include="..\workers\AbstractWorker.h" />
-    <ClInclude Include="..\workers\DedicatedWorkerContext.h" />
+    <ClInclude Include="..\workers\DedicatedWorkerGlobalScope.h" />
     <ClInclude Include="..\workers\DedicatedWorkerThread.h" />
     <ClInclude Include="..\workers\DefaultSharedWorkerRepository.h" />
     <ClInclude Include="..\workers\SharedWorker.h" />
-    <ClInclude Include="..\workers\SharedWorkerContext.h" />
+    <ClInclude Include="..\workers\SharedWorkerGlobalScope.h" />
     <ClInclude Include="..\workers\SharedWorkerRepository.h" />
     <ClInclude Include="..\workers\SharedWorkerStrategy.h" />
     <ClInclude Include="..\workers\SharedWorkerThread.h" />
     <ClInclude Include="..\workers\Worker.h" />
-    <ClInclude Include="..\workers\WorkerContext.h" />
-    <ClInclude Include="..\workers\WorkerContextProxy.h" />
+    <ClInclude Include="..\workers\WorkerGlobalScope.h" />
+    <ClInclude Include="..\workers\WorkerGlobalScopeProxy.h" />
     <ClInclude Include="..\workers\WorkerEventQueue.h" />
     <ClInclude Include="..\workers\WorkerLoaderProxy.h" />
     <ClInclude Include="..\workers\WorkerLocation.h" />
     <ClInclude Include="..\bindings\js\JSNodeCustom.h" />
     <ClInclude Include="..\bindings\js\JSNodeFilterCondition.h" />
     <ClInclude Include="..\bindings\js\JSPluginElementFunctions.h" />
-    <ClInclude Include="..\bindings\js\JSWorkerContextBase.h" />
+    <ClInclude Include="..\bindings\js\JSWorkerGlobalScopeBase.h" />
     <ClInclude Include="..\bindings\js\PageScriptDebugServer.h" />
     <ClInclude Include="..\bindings\js\ScheduledAction.h" />
     <ClInclude Include="..\bindings\js\ScriptCachedFrameData.h" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 5710201..ea3b164 100644 (file)
     <ClCompile Include="..\Modules\filesystem\LocalFileSystem.cpp">
       <Filter>Modules\filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\filesystem\WorkerContextFileSystem.cpp">
+    <ClCompile Include="..\Modules\filesystem\WorkerGlobalScopeFileSystem.cpp">
       <Filter>Modules\filesystem</Filter>
     </ClCompile>
     <ClCompile Include="..\Modules\geolocation\Coordinates.cpp">
     <ClCompile Include="..\Modules\indexeddb\PageGroupIndexedDatabase.cpp">
       <Filter>Modules\indexeddb</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\indexeddb\WorkerContextIndexedDatabase.cpp">
+    <ClCompile Include="..\Modules\indexeddb\WorkerGlobalScopeIndexedDatabase.cpp">
       <Filter>Modules\indexeddb</Filter>
     </ClCompile>
     <ClCompile Include="..\Modules\navigatorcontentutils\NavigatorContentUtils.cpp">
     <ClCompile Include="..\Modules\notifications\NotificationCenter.cpp">
       <Filter>Modules\notifications</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\notifications\WorkerContextNotifications.cpp">
+    <ClCompile Include="..\Modules\notifications\WorkerGlobalScopeNotifications.cpp">
       <Filter>Modules\notifications</Filter>
     </ClCompile>
     <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp">
     <ClCompile Include="..\Modules\webdatabase\SQLTransactionSync.cpp">
       <Filter>Modules\webdatabase</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\webdatabase\WorkerContextWebDatabase.cpp">
+    <ClCompile Include="..\Modules\webdatabase\WorkerGlobalScopeWebDatabase.cpp">
       <Filter>Modules\webdatabase</Filter>
     </ClCompile>
     <ClCompile Include="..\Modules\websockets\ThreadableWebSocketChannel.cpp">
     <ClCompile Include="..\workers\AbstractWorker.cpp">
       <Filter>workers</Filter>
     </ClCompile>
-    <ClCompile Include="..\workers\DedicatedWorkerContext.cpp">
+    <ClCompile Include="..\workers\DedicatedWorkerGlobalScope.cpp">
       <Filter>workers</Filter>
     </ClCompile>
     <ClCompile Include="..\workers\DedicatedWorkerThread.cpp">
     <ClCompile Include="..\workers\SharedWorker.cpp">
       <Filter>workers</Filter>
     </ClCompile>
-    <ClCompile Include="..\workers\SharedWorkerContext.cpp">
+    <ClCompile Include="..\workers\SharedWorkerGlobalScope.cpp">
       <Filter>workers</Filter>
     </ClCompile>
     <ClCompile Include="..\workers\SharedWorkerThread.cpp">
     <ClCompile Include="..\workers\Worker.cpp">
       <Filter>workers</Filter>
     </ClCompile>
-    <ClCompile Include="..\workers\WorkerContext.cpp">
+    <ClCompile Include="..\workers\WorkerGlobalScope.cpp">
       <Filter>workers</Filter>
     </ClCompile>
     <ClCompile Include="..\workers\WorkerEventQueue.cpp">
     <ClCompile Include="..\bindings\js\JSCustomXPathNSResolver.cpp">
       <Filter>bindings\js</Filter>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\JSDedicatedWorkerContextCustom.cpp">
+    <ClCompile Include="..\bindings\js\JSDedicatedWorkerGlobalScopeCustom.cpp">
       <Filter>bindings\js</Filter>
     </ClCompile>
     <ClCompile Include="..\bindings\js\JSDeviceMotionEventCustom.cpp">
     <ClCompile Include="..\bindings\js\JSWebKitPointCustom.cpp">
       <Filter>bindings\js</Filter>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\JSWorkerContextBase.cpp">
+    <ClCompile Include="..\bindings\js\JSWorkerGlobalScopeBase.cpp">
       <Filter>bindings\js</Filter>
     </ClCompile>
-    <ClCompile Include="..\bindings\js\JSWorkerContextCustom.cpp">
+    <ClCompile Include="..\bindings\js\JSWorkerGlobalScopeCustom.cpp">
       <Filter>bindings\js</Filter>
     </ClCompile>
     <ClCompile Include="..\bindings\js\JSWorkerCustom.cpp">
     <ClCompile Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSDataTransferItemList.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDedicatedWorkerContext.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDedicatedWorkerGlobalScope.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDeviceMotionEvent.cpp">
     <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorker.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorkerContext.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorkerGlobalScope.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSQLError.cpp">
     <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorker.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerContext.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerGlobalScope.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerLocation.cpp">
     <ClInclude Include="..\Modules\filesystem\SyncCallbackHelper.h">
       <Filter>Modules\filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\Modules\filesystem\WorkerContextFileSystem.h">
+    <ClInclude Include="..\Modules\filesystem\WorkerGlobalScopeFileSystem.h">
       <Filter>Modules\filesystem</Filter>
     </ClInclude>
     <ClInclude Include="..\Modules\geolocation\Coordinates.h">
     <ClInclude Include="..\Modules\indexeddb\PageGroupIndexedDatabase.h">
       <Filter>Modules\indexeddb</Filter>
     </ClInclude>
-    <ClInclude Include="..\Modules\indexeddb\WorkerContextIndexedDatabase.h">
+    <ClInclude Include="..\Modules\indexeddb\WorkerGlobalScopeIndexedDatabase.h">
       <Filter>Modules\indexeddb</Filter>
     </ClInclude>
     <ClInclude Include="..\Modules\navigatorcontentutils\NavigatorContentUtils.h">
     <ClInclude Include="..\Modules\notifications\NotificationClient.h">
       <Filter>Modules\notifications</Filter>
     </ClInclude>
-    <ClInclude Include="..\Modules\notifications\WorkerContextNotifications.h">
+    <ClInclude Include="..\Modules\notifications\WorkerGlobalScopeNotifications.h">
       <Filter>Modules\notifications</Filter>
     </ClInclude>
     <ClInclude Include="..\Modules\webdatabase\AbstractDatabaseServer.h">
     <ClInclude Include="..\Modules\webdatabase\SQLTransactionSyncCallback.h">
       <Filter>Modules\webdatabase</Filter>
     </ClInclude>
-    <ClInclude Include="..\Modules\webdatabase\WorkerContextWebDatabase.h">
+    <ClInclude Include="..\Modules\webdatabase\WorkerGlobalScopeWebDatabase.h">
       <Filter>Modules\webdatabase</Filter>
     </ClInclude>
     <ClInclude Include="..\Modules\websockets\CloseEvent.h">
     <ClInclude Include="..\workers\AbstractWorker.h">
       <Filter>workers</Filter>
     </ClInclude>
-    <ClInclude Include="..\workers\DedicatedWorkerContext.h">
+    <ClInclude Include="..\workers\DedicatedWorkerGlobalScope.h">
       <Filter>workers</Filter>
     </ClInclude>
     <ClInclude Include="..\workers\DedicatedWorkerThread.h">
     <ClInclude Include="..\workers\SharedWorker.h">
       <Filter>workers</Filter>
     </ClInclude>
-    <ClInclude Include="..\workers\SharedWorkerContext.h">
+    <ClInclude Include="..\workers\SharedWorkerGlobalScope.h">
       <Filter>workers</Filter>
     </ClInclude>
     <ClInclude Include="..\workers\SharedWorkerRepository.h">
     <ClInclude Include="..\workers\Worker.h">
       <Filter>workers</Filter>
     </ClInclude>
-    <ClInclude Include="..\workers\WorkerContext.h">
+    <ClInclude Include="..\workers\WorkerGlobalScope.h">
       <Filter>workers</Filter>
     </ClInclude>
-    <ClInclude Include="..\workers\WorkerContextProxy.h">
+    <ClInclude Include="..\workers\WorkerGlobalScopeProxy.h">
       <Filter>workers</Filter>
     </ClInclude>
     <ClInclude Include="..\workers\WorkerEventQueue.h">
     <ClInclude Include="..\bindings\js\JSPluginElementFunctions.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
-    <ClInclude Include="..\bindings\js\JSWorkerContextBase.h">
+    <ClInclude Include="..\bindings\js\JSWorkerGlobalScopeBase.h">
       <Filter>bindings\js</Filter>
     </ClInclude>
     <ClInclude Include="..\bindings\js\PageScriptDebugServer.h">
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSDataTransferItemList.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDedicatedWorkerContext.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDedicatedWorkerGlobalScope.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSDeviceMotionEvent.h">
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorker.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorkerContext.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSSharedWorkerGlobalScope.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSQLError.h">
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorker.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerContext.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerGlobalScope.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWorkerLocation.h">
index 59b5b12..52fff0f 100644 (file)
                2E3FAA0911A36BF100576624 /* CrossThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E3FAA0811A36BF100576624 /* CrossThreadTask.h */; };
                2E4346450F546A8200B0F1BA /* Worker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346330F546A8200B0F1BA /* Worker.cpp */; };
                2E4346460F546A8200B0F1BA /* Worker.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346340F546A8200B0F1BA /* Worker.h */; };
-               2E4346480F546A8200B0F1BA /* WorkerContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346360F546A8200B0F1BA /* WorkerContext.cpp */; };
-               2E4346490F546A8200B0F1BA /* WorkerContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346370F546A8200B0F1BA /* WorkerContext.h */; };
-               2E43464B0F546A8200B0F1BA /* WorkerContextProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346390F546A8200B0F1BA /* WorkerContextProxy.h */; };
+               2E4346480F546A8200B0F1BA /* WorkerGlobalScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E4346360F546A8200B0F1BA /* WorkerGlobalScope.cpp */; };
+               2E4346490F546A8200B0F1BA /* WorkerGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346370F546A8200B0F1BA /* WorkerGlobalScope.h */; };
+               2E43464B0F546A8200B0F1BA /* WorkerGlobalScopeProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E4346390F546A8200B0F1BA /* WorkerGlobalScopeProxy.h */; };
                2E43464C0F546A8200B0F1BA /* WorkerLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E43463A0F546A8200B0F1BA /* WorkerLocation.cpp */; };
                2E43464D0F546A8200B0F1BA /* WorkerLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E43463B0F546A8200B0F1BA /* WorkerLocation.h */; };
                2E43464F0F546A8200B0F1BA /* WorkerMessagingProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2E43463D0F546A8200B0F1BA /* WorkerMessagingProxy.cpp */; };
                4150F9F212B6E0E70008C860 /* SliderThumbElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */; };
                4157AF8012F1FB0400A8C6F5 /* MediaControlsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */; };
                4157AF8112F1FB0400A8C6F5 /* MediaControlsApple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */; };
-               4162A450101145AE00DFF3ED /* DedicatedWorkerContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162A44D101145AE00DFF3ED /* DedicatedWorkerContext.cpp */; };
-               4162A451101145AE00DFF3ED /* DedicatedWorkerContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4162A44E101145AE00DFF3ED /* DedicatedWorkerContext.h */; };
-               4162A454101145E300DFF3ED /* JSDedicatedWorkerContextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162A453101145E300DFF3ED /* JSDedicatedWorkerContextCustom.cpp */; };
-               4162A4571011464700DFF3ED /* JSDedicatedWorkerContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162A4551011464700DFF3ED /* JSDedicatedWorkerContext.cpp */; };
-               4162A4581011464700DFF3ED /* JSDedicatedWorkerContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4162A4561011464700DFF3ED /* JSDedicatedWorkerContext.h */; };
+               4162A450101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162A44D101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp */; };
+               4162A451101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 4162A44E101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h */; };
+               4162A454101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162A453101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp */; };
+               4162A4571011464700DFF3ED /* JSDedicatedWorkerGlobalScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162A4551011464700DFF3ED /* JSDedicatedWorkerGlobalScope.cpp */; };
+               4162A4581011464700DFF3ED /* JSDedicatedWorkerGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 4162A4561011464700DFF3ED /* JSDedicatedWorkerGlobalScope.h */; };
                4167EBF5102962BA003D252A /* DefaultSharedWorkerRepository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4167EBF3102962BA003D252A /* DefaultSharedWorkerRepository.cpp */; };
                4167EBF6102962BA003D252A /* DefaultSharedWorkerRepository.h in Headers */ = {isa = PBXBuildFile; fileRef = 4167EBF4102962BA003D252A /* DefaultSharedWorkerRepository.h */; };
                416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 416E29A5102FA962007FC14E /* WorkerReportingProxy.h */; };
                41D015CB0F4B5C71004A662F /* ContentType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D015C90F4B5C71004A662F /* ContentType.cpp */; };
                41D07A7E0FF935CA0095EDCE /* JSSharedWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D07A7C0FF935CA0095EDCE /* JSSharedWorker.cpp */; };
                41D07A7F0FF935CA0095EDCE /* JSSharedWorker.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D07A7D0FF935CA0095EDCE /* JSSharedWorker.h */; };
-               41D168E710226E89009BC827 /* SharedWorkerContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D168DF10226E89009BC827 /* SharedWorkerContext.cpp */; };
-               41D168E810226E89009BC827 /* SharedWorkerContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D168E010226E89009BC827 /* SharedWorkerContext.h */; };
+               41D168E710226E89009BC827 /* SharedWorkerGlobalScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D168DF10226E89009BC827 /* SharedWorkerGlobalScope.cpp */; };
+               41D168E810226E89009BC827 /* SharedWorkerGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D168E010226E89009BC827 /* SharedWorkerGlobalScope.h */; };
                41D168EA10226E89009BC827 /* SharedWorkerRepository.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D168E210226E89009BC827 /* SharedWorkerRepository.h */; };
                41D168ED10226E89009BC827 /* SharedWorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D168E510226E89009BC827 /* SharedWorkerThread.cpp */; };
                41D168EE10226E89009BC827 /* SharedWorkerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D168E610226E89009BC827 /* SharedWorkerThread.h */; };
-               41D1690510238B66009BC827 /* JSSharedWorkerContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D1690310238B66009BC827 /* JSSharedWorkerContext.cpp */; };
-               41D1690610238B66009BC827 /* JSSharedWorkerContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D1690410238B66009BC827 /* JSSharedWorkerContext.h */; };
+               41D1690510238B66009BC827 /* JSSharedWorkerGlobalScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D1690310238B66009BC827 /* JSSharedWorkerGlobalScope.cpp */; };
+               41D1690610238B66009BC827 /* JSSharedWorkerGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 41D1690410238B66009BC827 /* JSSharedWorkerGlobalScope.h */; };
                41E1B1D00FF5986900576B3B /* AbstractWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41E1B1CA0FF5986900576B3B /* AbstractWorker.cpp */; };
                41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */ = {isa = PBXBuildFile; fileRef = 41E1B1CB0FF5986900576B3B /* AbstractWorker.h */; };
                41E1B1D30FF5986900576B3B /* SharedWorker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41E1B1CD0FF5986900576B3B /* SharedWorker.cpp */; };
                9712A5FF15004EDA0048AF10 /* IDBVersionChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A5A615004EDA0048AF10 /* IDBVersionChangeEvent.h */; };
                9712A60415004EDA0048AF10 /* PageGroupIndexedDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9712A5AB15004EDA0048AF10 /* PageGroupIndexedDatabase.cpp */; };
                9712A60515004EDA0048AF10 /* PageGroupIndexedDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A5AC15004EDA0048AF10 /* PageGroupIndexedDatabase.h */; };
-               9712A611150090CE0048AF10 /* WorkerContextIndexedDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9712A60E150090CE0048AF10 /* WorkerContextIndexedDatabase.cpp */; };
-               9712A612150090CE0048AF10 /* WorkerContextIndexedDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A60F150090CE0048AF10 /* WorkerContextIndexedDatabase.h */; };
+               9712A611150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9712A60E150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.cpp */; };
+               9712A612150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 9712A60F150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.h */; };
                97205AAF123928CA00B17380 /* FTPDirectoryDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97205AAD123928CA00B17380 /* FTPDirectoryDocument.cpp */; };
                97205AB0123928CA00B17380 /* FTPDirectoryDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 97205AAE123928CA00B17380 /* FTPDirectoryDocument.h */; };
                97205AB51239291000B17380 /* ImageDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97205AB11239291000B17380 /* ImageDocument.cpp */; };
                97E4028F13A696ED00913D67 /* IconController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97E4028D13A696ED00913D67 /* IconController.cpp */; };
                97E4029013A696ED00913D67 /* IconController.h in Headers */ = {isa = PBXBuildFile; fileRef = 97E4028E13A696ED00913D67 /* IconController.h */; settings = {ATTRIBUTES = (Private, ); }; };
                97EF7DFE107E55B700D7C49C /* ScriptControllerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97EF7DFD107E55B700D7C49C /* ScriptControllerBase.cpp */; };
-               97F8E665151D4A4B00D2D181 /* WorkerContextNotifications.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97F8E661151D4A3F00D2D181 /* WorkerContextNotifications.cpp */; };
-               97F8E666151D4A4E00D2D181 /* WorkerContextNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 97F8E662151D4A3F00D2D181 /* WorkerContextNotifications.h */; };
+               97F8E665151D4A4B00D2D181 /* WorkerGlobalScopeNotifications.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97F8E661151D4A3F00D2D181 /* WorkerGlobalScopeNotifications.cpp */; };
+               97F8E666151D4A4E00D2D181 /* WorkerGlobalScopeNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 97F8E662151D4A3F00D2D181 /* WorkerGlobalScopeNotifications.h */; };
                9831AE4A154225C900FE2644 /* ReferrerPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 9831AE49154225A200FE2644 /* ReferrerPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
                984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 984264EF12D5280A000D88A4 /* LinkLoaderClient.h */; };
                985BB96D13A94058007A0B69 /* LinkRelAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 985BB96B13A94058007A0B69 /* LinkRelAttribute.cpp */; };
                A8CB413E0E8633FD0032C4F0 /* DashArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CB41020E85B8A50032C4F0 /* DashArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A8CCBB48151F831600AB7CE9 /* DOMWindowWebDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8CCBB46151F831600AB7CE9 /* DOMWindowWebDatabase.cpp */; };
                A8CCBB49151F831600AB7CE9 /* DOMWindowWebDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CCBB47151F831600AB7CE9 /* DOMWindowWebDatabase.h */; };
-               A8CCBB4C151F833B00AB7CE9 /* WorkerContextWebDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8CCBB4A151F833B00AB7CE9 /* WorkerContextWebDatabase.cpp */; };
-               A8CCBB4D151F833B00AB7CE9 /* WorkerContextWebDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CCBB4B151F833B00AB7CE9 /* WorkerContextWebDatabase.h */; };
+               A8CCBB4C151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8CCBB4A151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp */; };
+               A8CCBB4D151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CCBB4B151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h */; };
                A8CFF04D0A154F09000A4234 /* FixedTableLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8CFF0480A154F09000A4234 /* FixedTableLayout.cpp */; };
                A8CFF04E0A154F09000A4234 /* AutoTableLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CFF0490A154F09000A4234 /* AutoTableLayout.h */; };
                A8CFF04F0A154F09000A4234 /* FixedTableLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CFF04A0A154F09000A4234 /* FixedTableLayout.h */; };
                E180811216FCF42F00B80D07 /* SynchronousLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E180811016FCF42E00B80D07 /* SynchronousLoaderClient.cpp */; };
                E180811616FCF9CB00B80D07 /* SynchronousLoaderClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = E180811416FCF9CB00B80D07 /* SynchronousLoaderClient.mm */; };
                E180811716FCF9CB00B80D07 /* SynchronousLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E180811516FCF9CB00B80D07 /* SynchronousLoaderClient.h */; };
-               E182568F0EF2B02D00933242 /* JSWorkerContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E182568D0EF2B02D00933242 /* JSWorkerContext.cpp */; };
-               E18256900EF2B02D00933242 /* JSWorkerContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E182568E0EF2B02D00933242 /* JSWorkerContext.h */; };
-               E18258AC0EF3CD7000933242 /* JSWorkerContextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18258AB0EF3CD7000933242 /* JSWorkerContextCustom.cpp */; };
+               E182568F0EF2B02D00933242 /* JSWorkerGlobalScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E182568D0EF2B02D00933242 /* JSWorkerGlobalScope.cpp */; };
+               E18256900EF2B02D00933242 /* JSWorkerGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = E182568E0EF2B02D00933242 /* JSWorkerGlobalScope.h */; };
+               E18258AC0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18258AB0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp */; };
                E187056316E54A0D00585E97 /* MainThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = E187056216E54A0D00585E97 /* MainThreadTask.h */; };
                E18772F1126E2629003DD586 /* Language.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18772F0126E2629003DD586 /* Language.cpp */; };
                E1A1470811102B1500EEC0F3 /* ContainerNodeAlgorithms.h in Headers */ = {isa = PBXBuildFile; fileRef = E1A1470711102B1500EEC0F3 /* ContainerNodeAlgorithms.h */; };
                E1C362F00EAF2AA9007410BC /* JSWorkerLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C362EE0EAF2AA9007410BC /* JSWorkerLocation.cpp */; };
                E1C36C030EB076D6007410BC /* JSDOMGlobalObject.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C36C020EB076D6007410BC /* JSDOMGlobalObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E1C36CBD0EB08062007410BC /* JSDOMGlobalObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C36CBC0EB08062007410BC /* JSDOMGlobalObject.cpp */; };
-               E1C36D340EB0A094007410BC /* JSWorkerContextBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C36D320EB0A094007410BC /* JSWorkerContextBase.cpp */; };
-               E1C36D350EB0A094007410BC /* JSWorkerContextBase.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C36D330EB0A094007410BC /* JSWorkerContextBase.h */; };
+               E1C36D340EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C36D320EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp */; };
+               E1C36D350EB0A094007410BC /* JSWorkerGlobalScopeBase.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C36D330EB0A094007410BC /* JSWorkerGlobalScopeBase.h */; };
                E1C415DA0F655D6F0092D2FB /* CrossOriginPreflightResultCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C415D90F655D6F0092D2FB /* CrossOriginPreflightResultCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E1C415DE0F655D7C0092D2FB /* CrossOriginPreflightResultCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1C415DD0F655D7C0092D2FB /* CrossOriginPreflightResultCache.cpp */; };
                E1C416120F6562FD0092D2FB /* CrossOriginAccessControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E1C416110F6562FD0092D2FB /* CrossOriginAccessControl.h */; };
                2E4346330F546A8200B0F1BA /* Worker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Worker.cpp; path = workers/Worker.cpp; sourceTree = "<group>"; };
                2E4346340F546A8200B0F1BA /* Worker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Worker.h; path = workers/Worker.h; sourceTree = "<group>"; };
                2E4346350F546A8200B0F1BA /* Worker.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Worker.idl; path = workers/Worker.idl; sourceTree = "<group>"; };
-               2E4346360F546A8200B0F1BA /* WorkerContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerContext.cpp; path = workers/WorkerContext.cpp; sourceTree = "<group>"; };
-               2E4346370F546A8200B0F1BA /* WorkerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerContext.h; path = workers/WorkerContext.h; sourceTree = "<group>"; };
-               2E4346380F546A8200B0F1BA /* WorkerContext.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerContext.idl; path = workers/WorkerContext.idl; sourceTree = "<group>"; };
-               2E4346390F546A8200B0F1BA /* WorkerContextProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerContextProxy.h; path = workers/WorkerContextProxy.h; sourceTree = "<group>"; };
+               2E4346360F546A8200B0F1BA /* WorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerGlobalScope.cpp; path = workers/WorkerGlobalScope.cpp; sourceTree = "<group>"; };
+               2E4346370F546A8200B0F1BA /* WorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerGlobalScope.h; path = workers/WorkerGlobalScope.h; sourceTree = "<group>"; };
+               2E4346380F546A8200B0F1BA /* WorkerGlobalScope.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerGlobalScope.idl; path = workers/WorkerGlobalScope.idl; sourceTree = "<group>"; };
+               2E4346390F546A8200B0F1BA /* WorkerGlobalScopeProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerGlobalScopeProxy.h; path = workers/WorkerGlobalScopeProxy.h; sourceTree = "<group>"; };
                2E43463A0F546A8200B0F1BA /* WorkerLocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerLocation.cpp; path = workers/WorkerLocation.cpp; sourceTree = "<group>"; };
                2E43463B0F546A8200B0F1BA /* WorkerLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerLocation.h; path = workers/WorkerLocation.h; sourceTree = "<group>"; };
                2E43463C0F546A8200B0F1BA /* WorkerLocation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerLocation.idl; path = workers/WorkerLocation.idl; sourceTree = "<group>"; };
                4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SliderThumbElement.cpp; sourceTree = "<group>"; };
                4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlsApple.h; sourceTree = "<group>"; };
                4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlsApple.cpp; sourceTree = "<group>"; };
-               4162A44D101145AE00DFF3ED /* DedicatedWorkerContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DedicatedWorkerContext.cpp; path = workers/DedicatedWorkerContext.cpp; sourceTree = "<group>"; };
-               4162A44E101145AE00DFF3ED /* DedicatedWorkerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DedicatedWorkerContext.h; path = workers/DedicatedWorkerContext.h; sourceTree = "<group>"; };
-               4162A44F101145AE00DFF3ED /* DedicatedWorkerContext.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DedicatedWorkerContext.idl; path = workers/DedicatedWorkerContext.idl; sourceTree = "<group>"; };
-               4162A453101145E300DFF3ED /* JSDedicatedWorkerContextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDedicatedWorkerContextCustom.cpp; sourceTree = "<group>"; };
-               4162A4551011464700DFF3ED /* JSDedicatedWorkerContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDedicatedWorkerContext.cpp; sourceTree = "<group>"; };
-               4162A4561011464700DFF3ED /* JSDedicatedWorkerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDedicatedWorkerContext.h; sourceTree = "<group>"; };
+               4162A44D101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DedicatedWorkerGlobalScope.cpp; path = workers/DedicatedWorkerGlobalScope.cpp; sourceTree = "<group>"; };
+               4162A44E101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DedicatedWorkerGlobalScope.h; path = workers/DedicatedWorkerGlobalScope.h; sourceTree = "<group>"; };
+               4162A44F101145AE00DFF3ED /* DedicatedWorkerGlobalScope.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DedicatedWorkerGlobalScope.idl; path = workers/DedicatedWorkerGlobalScope.idl; sourceTree = "<group>"; };
+               4162A453101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDedicatedWorkerGlobalScopeCustom.cpp; sourceTree = "<group>"; };
+               4162A4551011464700DFF3ED /* JSDedicatedWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDedicatedWorkerGlobalScope.cpp; sourceTree = "<group>"; };
+               4162A4561011464700DFF3ED /* JSDedicatedWorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDedicatedWorkerGlobalScope.h; sourceTree = "<group>"; };
                4167EBF3102962BA003D252A /* DefaultSharedWorkerRepository.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DefaultSharedWorkerRepository.cpp; path = workers/DefaultSharedWorkerRepository.cpp; sourceTree = "<group>"; };
                4167EBF4102962BA003D252A /* DefaultSharedWorkerRepository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultSharedWorkerRepository.h; path = workers/DefaultSharedWorkerRepository.h; sourceTree = "<group>"; };
                416E29A5102FA962007FC14E /* WorkerReportingProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerReportingProxy.h; path = workers/WorkerReportingProxy.h; sourceTree = "<group>"; };
                41D015C90F4B5C71004A662F /* ContentType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentType.cpp; sourceTree = "<group>"; };
                41D07A7C0FF935CA0095EDCE /* JSSharedWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSharedWorker.cpp; sourceTree = "<group>"; };
                41D07A7D0FF935CA0095EDCE /* JSSharedWorker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSharedWorker.h; sourceTree = "<group>"; };
-               41D168DF10226E89009BC827 /* SharedWorkerContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedWorkerContext.cpp; path = workers/SharedWorkerContext.cpp; sourceTree = "<group>"; };
-               41D168E010226E89009BC827 /* SharedWorkerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedWorkerContext.h; path = workers/SharedWorkerContext.h; sourceTree = "<group>"; };
-               41D168E110226E89009BC827 /* SharedWorkerContext.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SharedWorkerContext.idl; path = workers/SharedWorkerContext.idl; sourceTree = "<group>"; };
+               41D168DF10226E89009BC827 /* SharedWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedWorkerGlobalScope.cpp; path = workers/SharedWorkerGlobalScope.cpp; sourceTree = "<group>"; };
+               41D168E010226E89009BC827 /* SharedWorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedWorkerGlobalScope.h; path = workers/SharedWorkerGlobalScope.h; sourceTree = "<group>"; };
+               41D168E110226E89009BC827 /* SharedWorkerGlobalScope.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SharedWorkerGlobalScope.idl; path = workers/SharedWorkerGlobalScope.idl; sourceTree = "<group>"; };
                41D168E210226E89009BC827 /* SharedWorkerRepository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedWorkerRepository.h; path = workers/SharedWorkerRepository.h; sourceTree = "<group>"; };
                41D168E510226E89009BC827 /* SharedWorkerThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedWorkerThread.cpp; path = workers/SharedWorkerThread.cpp; sourceTree = "<group>"; };
                41D168E610226E89009BC827 /* SharedWorkerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedWorkerThread.h; path = workers/SharedWorkerThread.h; sourceTree = "<group>"; };
-               41D1690310238B66009BC827 /* JSSharedWorkerContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSharedWorkerContext.cpp; sourceTree = "<group>"; };
-               41D1690410238B66009BC827 /* JSSharedWorkerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSharedWorkerContext.h; sourceTree = "<group>"; };
+               41D1690310238B66009BC827 /* JSSharedWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSharedWorkerGlobalScope.cpp; sourceTree = "<group>"; };
+               41D1690410238B66009BC827 /* JSSharedWorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSharedWorkerGlobalScope.h; sourceTree = "<group>"; };
                41E1B1CA0FF5986900576B3B /* AbstractWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AbstractWorker.cpp; path = workers/AbstractWorker.cpp; sourceTree = "<group>"; };
                41E1B1CB0FF5986900576B3B /* AbstractWorker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AbstractWorker.h; path = workers/AbstractWorker.h; sourceTree = "<group>"; };
                41E1B1CC0FF5986900576B3B /* AbstractWorker.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AbstractWorker.idl; path = workers/AbstractWorker.idl; sourceTree = "<group>"; };
                9712A5A715004EDA0048AF10 /* IDBVersionChangeEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDBVersionChangeEvent.idl; path = Modules/indexeddb/IDBVersionChangeEvent.idl; sourceTree = "<group>"; };
                9712A5AB15004EDA0048AF10 /* PageGroupIndexedDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PageGroupIndexedDatabase.cpp; path = Modules/indexeddb/PageGroupIndexedDatabase.cpp; sourceTree = "<group>"; };
                9712A5AC15004EDA0048AF10 /* PageGroupIndexedDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PageGroupIndexedDatabase.h; path = Modules/indexeddb/PageGroupIndexedDatabase.h; sourceTree = "<group>"; };
-               9712A60E150090CE0048AF10 /* WorkerContextIndexedDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerContextIndexedDatabase.cpp; path = Modules/indexeddb/WorkerContextIndexedDatabase.cpp; sourceTree = "<group>"; };
-               9712A60F150090CE0048AF10 /* WorkerContextIndexedDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerContextIndexedDatabase.h; path = Modules/indexeddb/WorkerContextIndexedDatabase.h; sourceTree = "<group>"; };
-               9712A610150090CE0048AF10 /* WorkerContextIndexedDatabase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerContextIndexedDatabase.idl; path = Modules/indexeddb/WorkerContextIndexedDatabase.idl; sourceTree = "<group>"; };
+               9712A60E150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerGlobalScopeIndexedDatabase.cpp; path = Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp; sourceTree = "<group>"; };
+               9712A60F150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerGlobalScopeIndexedDatabase.h; path = Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h; sourceTree = "<group>"; };
+               9712A610150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerGlobalScopeIndexedDatabase.idl; path = Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl; sourceTree = "<group>"; };
                97205AAD123928CA00B17380 /* FTPDirectoryDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FTPDirectoryDocument.cpp; sourceTree = "<group>"; };
                97205AAE123928CA00B17380 /* FTPDirectoryDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPDirectoryDocument.h; sourceTree = "<group>"; };
                97205AB11239291000B17380 /* ImageDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageDocument.cpp; sourceTree = "<group>"; };
                97E9EC8B15DC492F004F2E71 /* JSVoidCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSVoidCallback.cpp; sourceTree = "<group>"; };
                97E9EC8C15DC492F004F2E71 /* JSVoidCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSVoidCallback.h; sourceTree = "<group>"; };
                97EF7DFD107E55B700D7C49C /* ScriptControllerBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptControllerBase.cpp; sourceTree = "<group>"; };
-               97F8E661151D4A3F00D2D181 /* WorkerContextNotifications.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerContextNotifications.cpp; path = Modules/notifications/WorkerContextNotifications.cpp; sourceTree = "<group>"; };
-               97F8E662151D4A3F00D2D181 /* WorkerContextNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerContextNotifications.h; path = Modules/notifications/WorkerContextNotifications.h; sourceTree = "<group>"; };
-               97F8E663151D4A3F00D2D181 /* WorkerContextNotifications.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerContextNotifications.idl; path = Modules/notifications/WorkerContextNotifications.idl; sourceTree = "<group>"; };
+               97F8E661151D4A3F00D2D181 /* WorkerGlobalScopeNotifications.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerGlobalScopeNotifications.cpp; path = Modules/notifications/WorkerGlobalScopeNotifications.cpp; sourceTree = "<group>"; };
+               97F8E662151D4A3F00D2D181 /* WorkerGlobalScopeNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerGlobalScopeNotifications.h; path = Modules/notifications/WorkerGlobalScopeNotifications.h; sourceTree = "<group>"; };
+               97F8E663151D4A3F00D2D181 /* WorkerGlobalScopeNotifications.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerGlobalScopeNotifications.idl; path = Modules/notifications/WorkerGlobalScopeNotifications.idl; sourceTree = "<group>"; };
                9831AE49154225A200FE2644 /* ReferrerPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReferrerPolicy.h; sourceTree = "<group>"; };
                984264EF12D5280A000D88A4 /* LinkLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinkLoaderClient.h; sourceTree = "<group>"; };
                985BB96B13A94058007A0B69 /* LinkRelAttribute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinkRelAttribute.cpp; sourceTree = "<group>"; };
                A8CB41020E85B8A50032C4F0 /* DashArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DashArray.h; sourceTree = "<group>"; };
                A8CCBB46151F831600AB7CE9 /* DOMWindowWebDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DOMWindowWebDatabase.cpp; path = Modules/webdatabase/DOMWindowWebDatabase.cpp; sourceTree = "<group>"; };
                A8CCBB47151F831600AB7CE9 /* DOMWindowWebDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMWindowWebDatabase.h; path = Modules/webdatabase/DOMWindowWebDatabase.h; sourceTree = "<group>"; };
-               A8CCBB4A151F833B00AB7CE9 /* WorkerContextWebDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerContextWebDatabase.cpp; path = Modules/webdatabase/WorkerContextWebDatabase.cpp; sourceTree = "<group>"; };
-               A8CCBB4B151F833B00AB7CE9 /* WorkerContextWebDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerContextWebDatabase.h; path = Modules/webdatabase/WorkerContextWebDatabase.h; sourceTree = "<group>"; };
+               A8CCBB4A151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerGlobalScopeWebDatabase.cpp; path = Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp; sourceTree = "<group>"; };
+               A8CCBB4B151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerGlobalScopeWebDatabase.h; path = Modules/webdatabase/WorkerGlobalScopeWebDatabase.h; sourceTree = "<group>"; };
                A8CCBB4E151F835A00AB7CE9 /* DOMWindowWebDatabase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMWindowWebDatabase.idl; path = Modules/webdatabase/DOMWindowWebDatabase.idl; sourceTree = "<group>"; };
-               A8CCBB4F151F837500AB7CE9 /* WorkerContextWebDatabase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerContextWebDatabase.idl; path = Modules/webdatabase/WorkerContextWebDatabase.idl; sourceTree = "<group>"; };
+               A8CCBB4F151F837500AB7CE9 /* WorkerGlobalScopeWebDatabase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WorkerGlobalScopeWebDatabase.idl; path = Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl; sourceTree = "<group>"; };
                A8CFF0480A154F09000A4234 /* FixedTableLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FixedTableLayout.cpp; sourceTree = "<group>"; };
                A8CFF0490A154F09000A4234 /* AutoTableLayout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AutoTableLayout.h; sourceTree = "<group>"; };
                A8CFF04A0A154F09000A4234 /* FixedTableLayout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FixedTableLayout.h; sourceTree = "<group>"; };
                E180811016FCF42E00B80D07 /* SynchronousLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SynchronousLoaderClient.cpp; sourceTree = "<group>"; };
                E180811416FCF9CB00B80D07 /* SynchronousLoaderClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SynchronousLoaderClient.mm; sourceTree = "<group>"; };
                E180811516FCF9CB00B80D07 /* SynchronousLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SynchronousLoaderClient.h; sourceTree = "<group>"; };
-               E182568D0EF2B02D00933242 /* JSWorkerContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerContext.cpp; sourceTree = "<group>"; };
-               E182568E0EF2B02D00933242 /* JSWorkerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWorkerContext.h; sourceTree = "<group>"; };
-               E18258AB0EF3CD7000933242 /* JSWorkerContextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerContextCustom.cpp; sourceTree = "<group>"; };
+               E182568D0EF2B02D00933242 /* JSWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerGlobalScope.cpp; sourceTree = "<group>"; };
+               E182568E0EF2B02D00933242 /* JSWorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWorkerGlobalScope.h; sourceTree = "<group>"; };
+               E18258AB0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerGlobalScopeCustom.cpp; sourceTree = "<group>"; };
                E187056216E54A0D00585E97 /* MainThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainThreadTask.h; sourceTree = "<group>"; };
                E18772F0126E2629003DD586 /* Language.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Language.cpp; sourceTree = "<group>"; };
                E1A1470711102B1500EEC0F3 /* ContainerNodeAlgorithms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContainerNodeAlgorithms.h; sourceTree = "<group>"; };
                E1C362EE0EAF2AA9007410BC /* JSWorkerLocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerLocation.cpp; sourceTree = "<group>"; };
                E1C36C020EB076D6007410BC /* JSDOMGlobalObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMGlobalObject.h; sourceTree = "<group>"; };
                E1C36CBC0EB08062007410BC /* JSDOMGlobalObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMGlobalObject.cpp; sourceTree = "<group>"; };
-               E1C36D320EB0A094007410BC /* JSWorkerContextBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerContextBase.cpp; sourceTree = "<group>"; };
-               E1C36D330EB0A094007410BC /* JSWorkerContextBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWorkerContextBase.h; sourceTree = "<group>"; };
+               E1C36D320EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerGlobalScopeBase.cpp; sourceTree = "<group>"; };
+               E1C36D330EB0A094007410BC /* JSWorkerGlobalScopeBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWorkerGlobalScopeBase.h; sourceTree = "<group>"; };
                E1C415D90F655D6F0092D2FB /* CrossOriginPreflightResultCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossOriginPreflightResultCache.h; sourceTree = "<group>"; };
                E1C415DD0F655D7C0092D2FB /* CrossOriginPreflightResultCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CrossOriginPreflightResultCache.cpp; sourceTree = "<group>"; };
                E1C416110F6562FD0092D2FB /* CrossOriginAccessControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossOriginAccessControl.h; sourceTree = "<group>"; };
                                41E1B1CA0FF5986900576B3B /* AbstractWorker.cpp */,
                                41E1B1CB0FF5986900576B3B /* AbstractWorker.h */,
                                41E1B1CC0FF5986900576B3B /* AbstractWorker.idl */,
-                               4162A44D101145AE00DFF3ED /* DedicatedWorkerContext.cpp */,
-                               4162A44E101145AE00DFF3ED /* DedicatedWorkerContext.h */,
-                               4162A44F101145AE00DFF3ED /* DedicatedWorkerContext.idl */,
+                               4162A44D101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp */,
+                               4162A44E101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h */,
+                               4162A44F101145AE00DFF3ED /* DedicatedWorkerGlobalScope.idl */,
                                41A3D58C101C152D00316D07 /* DedicatedWorkerThread.cpp */,
                                41A3D58D101C152D00316D07 /* DedicatedWorkerThread.h */,
                                4167EBF3102962BA003D252A /* DefaultSharedWorkerRepository.cpp */,
                                41E1B1CD0FF5986900576B3B /* SharedWorker.cpp */,
                                41E1B1CE0FF5986900576B3B /* SharedWorker.h */,
                                41E1B1CF0FF5986900576B3B /* SharedWorker.idl */,
-                               41D168DF10226E89009BC827 /* SharedWorkerContext.cpp */,
-                               41D168E010226E89009BC827 /* SharedWorkerContext.h */,
-                               41D168E110226E89009BC827 /* SharedWorkerContext.idl */,
+                               41D168DF10226E89009BC827 /* SharedWorkerGlobalScope.cpp */,
+                               41D168E010226E89009BC827 /* SharedWorkerGlobalScope.h */,
+                               41D168E110226E89009BC827 /* SharedWorkerGlobalScope.idl */,
                                E1B7841F1639CBBE0007B692 /* SharedWorkerRepository.cpp */,
                                41D168E210226E89009BC827 /* SharedWorkerRepository.h */,
                                E1B7839B163740A70007B692 /* SharedWorkerStrategy.h */,
                                2E4346330F546A8200B0F1BA /* Worker.cpp */,
                                2E4346340F546A8200B0F1BA /* Worker.h */,
                                2E4346350F546A8200B0F1BA /* Worker.idl */,
-                               2E4346360F546A8200B0F1BA /* WorkerContext.cpp */,
-                               2E4346370F546A8200B0F1BA /* WorkerContext.h */,
-                               2E4346380F546A8200B0F1BA /* WorkerContext.idl */,
-                               2E4346390F546A8200B0F1BA /* WorkerContextProxy.h */,
+                               2E4346360F546A8200B0F1BA /* WorkerGlobalScope.cpp */,
+                               2E4346370F546A8200B0F1BA /* WorkerGlobalScope.h */,
+                               2E4346380F546A8200B0F1BA /* WorkerGlobalScope.idl */,
+                               2E4346390F546A8200B0F1BA /* WorkerGlobalScopeProxy.h */,
                                A3E2642E14748991005A8588 /* WorkerEventQueue.cpp */,
                                A3E2642F14748991005A8588 /* WorkerEventQueue.h */,
                                18F831B70FD48C7800D8C56B /* WorkerLoaderProxy.h */,
                                3128CA6A147331630074C72A /* NotificationController.h */,
                                31EC1DAC14FF26EA00C94662 /* NotificationPermissionCallback.h */,
                                31EC1D5014FEFD0800C94662 /* NotificationPermissionCallback.idl */,
-                               97F8E661151D4A3F00D2D181 /* WorkerContextNotifications.cpp */,
-                               97F8E662151D4A3F00D2D181 /* WorkerContextNotifications.h */,
-                               97F8E663151D4A3F00D2D181 /* WorkerContextNotifications.idl */,
+                               97F8E661151D4A3F00D2D181 /* WorkerGlobalScopeNotifications.cpp */,
+                               97F8E662151D4A3F00D2D181 /* WorkerGlobalScopeNotifications.h */,
+                               97F8E663151D4A3F00D2D181 /* WorkerGlobalScopeNotifications.idl */,
                        );
                        name = notifications;
                        sourceTree = "<group>";
                                9712A5A715004EDA0048AF10 /* IDBVersionChangeEvent.idl */,
                                9712A5AB15004EDA0048AF10 /* PageGroupIndexedDatabase.cpp */,
                                9712A5AC15004EDA0048AF10 /* PageGroupIndexedDatabase.h */,
-                               9712A60E150090CE0048AF10 /* WorkerContextIndexedDatabase.cpp */,
-                               9712A60F150090CE0048AF10 /* WorkerContextIndexedDatabase.h */,
-                               9712A610150090CE0048AF10 /* WorkerContextIndexedDatabase.idl */,
+                               9712A60E150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.cpp */,
+                               9712A60F150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.h */,
+                               9712A610150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.idl */,
                        );
                        name = indexeddb;
                        sourceTree = "<group>";
                                97BC6A1A1505F081001B74AC /* SQLTransactionSync.idl */,
                                97BC6A1B1505F081001B74AC /* SQLTransactionSyncCallback.h */,
                                97BC6A1C1505F081001B74AC /* SQLTransactionSyncCallback.idl */,
-                               A8CCBB4A151F833B00AB7CE9 /* WorkerContextWebDatabase.cpp */,
-                               A8CCBB4B151F833B00AB7CE9 /* WorkerContextWebDatabase.h */,
-                               A8CCBB4F151F837500AB7CE9 /* WorkerContextWebDatabase.idl */,
+                               A8CCBB4A151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp */,
+                               A8CCBB4B151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h */,
+                               A8CCBB4F151F837500AB7CE9 /* WorkerGlobalScopeWebDatabase.idl */,
                        );
                        name = webdatabase;
                        sourceTree = "<group>";
                                93B70D4F09EB0C7C009D8468 /* JSPluginElementFunctions.cpp */,
                                93B70D5009EB0C7C009D8468 /* JSPluginElementFunctions.h */,
                                14CD8D81106B529000A46D23 /* JSSharedWorkerCustom.cpp */,
-                               E1C36D320EB0A094007410BC /* JSWorkerContextBase.cpp */,
-                               E1C36D330EB0A094007410BC /* JSWorkerContextBase.h */,
+                               E1C36D320EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp */,
+                               E1C36D330EB0A094007410BC /* JSWorkerGlobalScopeBase.h */,
                                F34742E21343633C00531BC2 /* PageScriptDebugServer.cpp */,
                                F34742E31343633C00531BC2 /* PageScriptDebugServer.h */,
                                BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */,
                                E1AD14E71297377400ACA989 /* JSCSSStyleRuleCustom.cpp */,
                                BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */,
                                2E97CCF61293A43A00C5C8FF /* JSDataViewCustom.cpp */,
-                               4162A453101145E300DFF3ED /* JSDedicatedWorkerContextCustom.cpp */,
+                               4162A453101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp */,
                                31FB1A6B120A5D6900DC02A0 /* JSDeviceMotionEventCustom.cpp */,
                                590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */,
                                49C7BA8C1042F5B10009D447 /* JSDocumentCustom.cpp */,
                                E1AD14C41297354900ACA989 /* JSWebKitCSSKeyframeRuleCustom.cpp */,
                                E1AD14B4129734CA00ACA989 /* JSWebKitCSSKeyframesRuleCustom.cpp */,
                                BC275B7811C5D1C300C9206C /* JSWebKitPointCustom.cpp */,
-                               E18258AB0EF3CD7000933242 /* JSWorkerContextCustom.cpp */,
+                               E18258AB0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp */,
                                E1CA5CBB0E8CDCAF00E8EF90 /* JSWorkerCustom.cpp */,
                                BC348BBD0DB7F531004ABAB9 /* JSXMLHttpRequestCustom.cpp */,
                                BCDFD4910E3056BD009D10AD /* JSXMLHttpRequestUploadCustom.cpp */,
                        children = (
                                418F88020FF957AE0080F045 /* JSAbstractWorker.cpp */,
                                418F88030FF957AE0080F045 /* JSAbstractWorker.h */,
-                               4162A4551011464700DFF3ED /* JSDedicatedWorkerContext.cpp */,
-                               4162A4561011464700DFF3ED /* JSDedicatedWorkerContext.h */,
+                               4162A4551011464700DFF3ED /* JSDedicatedWorkerGlobalScope.cpp */,
+                               4162A4561011464700DFF3ED /* JSDedicatedWorkerGlobalScope.h */,
                                41D07A7C0FF935CA0095EDCE /* JSSharedWorker.cpp */,
                                41D07A7D0FF935CA0095EDCE /* JSSharedWorker.h */,
-                               41D1690310238B66009BC827 /* JSSharedWorkerContext.cpp */,
-                               41D1690410238B66009BC827 /* JSSharedWorkerContext.h */,
+                               41D1690310238B66009BC827 /* JSSharedWorkerGlobalScope.cpp */,
+                               41D1690410238B66009BC827 /* JSSharedWorkerGlobalScope.h */,
                                E1C8BE5C0E8BD15A0064CB7D /* JSWorker.cpp */,
                                E1CAA5C50E8BD23600A73ECA /* JSWorker.h */,
-                               E182568D0EF2B02D00933242 /* JSWorkerContext.cpp */,
-                               E182568E0EF2B02D00933242 /* JSWorkerContext.h */,
+                               E182568D0EF2B02D00933242 /* JSWorkerGlobalScope.cpp */,
+                               E182568E0EF2B02D00933242 /* JSWorkerGlobalScope.h */,
                                E1C362EE0EAF2AA9007410BC /* JSWorkerLocation.cpp */,
                                E1C362ED0EAF2AA9007410BC /* JSWorkerLocation.h */,
                                E1271A570EEECDE400F61213 /* JSWorkerNavigator.cpp */,
                                45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */,
                                A8C228A111D5722E00D5A7D3 /* DecodedDataDocumentParser.h in Headers */,
                                CECCFC3B141973D5002A0AC1 /* DecodeEscapeSequences.h in Headers */,
-                               4162A451101145AE00DFF3ED /* DedicatedWorkerContext.h in Headers */,
+                               4162A451101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h in Headers */,
                                41A3D58F101C152D00316D07 /* DedicatedWorkerThread.h in Headers */,
                                FD06DFA6134A4DEF006F5D7D /* DefaultAudioDestinationNode.h in Headers */,
                                4167EBF6102962BA003D252A /* DefaultSharedWorkerRepository.h in Headers */,
                                B59DD699119029E5007E9684 /* JSDatabaseCallback.h in Headers */,
                                B58CEB6911913607002A6790 /* JSDatabaseSync.h in Headers */,
                                2E97CE701293AD6B00C5C8FF /* JSDataView.h in Headers */,
-                               4162A4581011464700DFF3ED /* JSDedicatedWorkerContext.h in Headers */,
+                               4162A4581011464700DFF3ED /* JSDedicatedWorkerGlobalScope.h in Headers */,
                                FDA15ED212B03F94003A583A /* JSDelayNode.h in Headers */,
                                31FB1A66120A5D3F00DC02A0 /* JSDeviceMotionEvent.h in Headers */,
                                59A86008119DAFA100DEF1EF /* JSDeviceOrientationEvent.h in Headers */,
                                9FA37EFD1172FDA600C4CD55 /* JSScriptProfileNode.h in Headers */,
                                4A1E71A614E106AC00626F9D /* JSShadowRoot.h in Headers */,
                                41D07A7F0FF935CA0095EDCE /* JSSharedWorker.h in Headers */,
-                               41D1690610238B66009BC827 /* JSSharedWorkerContext.h in Headers */,
+                               41D1690610238B66009BC827 /* JSSharedWorkerGlobalScope.h in Headers */,
                                75415D56129AB2D2003AD669 /* JSSpeechInputEvent.h in Headers */,
                                75415D58129AB2D2003AD669 /* JSSpeechInputResult.h in Headers */,
                                75415D5A129AB2D2003AD669 /* JSSpeechInputResultList.h in Headers */,
                                5DA5E0FD102B953800088CF9 /* JSWebSocket.h in Headers */,
                                65DF320609D1CC60000BE325 /* JSWheelEvent.h in Headers */,
                                E1CAA5C60E8BD23600A73ECA /* JSWorker.h in Headers */,
-                               E18256900EF2B02D00933242 /* JSWorkerContext.h in Headers */,
-                               E1C36D350EB0A094007410BC /* JSWorkerContextBase.h in Headers */,
+                               E18256900EF2B02D00933242 /* JSWorkerGlobalScope.h in Headers */,
+                               E1C36D350EB0A094007410BC /* JSWorkerGlobalScopeBase.h in Headers */,
                                E1C362EF0EAF2AA9007410BC /* JSWorkerLocation.h in Headers */,
                                E1271A580EEECDE400F61213 /* JSWorkerNavigator.h in Headers */,
                                BC348BD40DB7F804004ABAB9 /* JSXMLHttpRequest.h in Headers */,
                                97B1F02F13B025D200F5103F /* SharedBufferChunkReader.h in Headers */,
                                93309EA3099EB78C0056E581 /* SharedTimer.h in Headers */,
                                41E1B1D40FF5986900576B3B /* SharedWorker.h in Headers */,
-                               41D168E810226E89009BC827 /* SharedWorkerContext.h in Headers */,
+                               41D168E810226E89009BC827 /* SharedWorkerGlobalScope.h in Headers */,
                                41D168EA10226E89009BC827 /* SharedWorkerRepository.h in Headers */,
                                E1B7839C163740A70007B692 /* SharedWorkerStrategy.h in Headers */,
                                41D168EE10226E89009BC827 /* SharedWorkerThread.h in Headers */,
                                379919971200DDF400EA041C /* WOFFFileFormat.h in Headers */,
                                2E4346460F546A8200B0F1BA /* Worker.h in Headers */,
                                F3820897147D35F90010BC06 /* WorkerConsoleAgent.h in Headers */,
-                               2E4346490F546A8200B0F1BA /* WorkerContext.h in Headers */,
-                               9712A612150090CE0048AF10 /* WorkerContextIndexedDatabase.h in Headers */,
-                               97F8E666151D4A4E00D2D181 /* WorkerContextNotifications.h in Headers */,
-                               2E43464B0F546A8200B0F1BA /* WorkerContextProxy.h in Headers */,
-                               A8CCBB4D151F833B00AB7CE9 /* WorkerContextWebDatabase.h in Headers */,
+                               2E4346490F546A8200B0F1BA /* WorkerGlobalScope.h in Headers */,
+                               9712A612150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.h in Headers */,
+                               97F8E666151D4A4E00D2D181 /* WorkerGlobalScopeNotifications.h in Headers */,
+                               2E43464B0F546A8200B0F1BA /* WorkerGlobalScopeProxy.h in Headers */,
+                               A8CCBB4D151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h in Headers */,
                                F34742E11343631F00531BC2 /* WorkerDebuggerAgent.h in Headers */,
                                A3E2643114748991005A8588 /* WorkerEventQueue.h in Headers */,
                                F36E07A51358A8BE00AACBC9 /* WorkerInspectorController.h in Headers */,
                                F55B3DB91251F12D003EF269 /* DateTimeLocalInputType.cpp in Sources */,
                                45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */,
                                A8C228A211D5722E00D5A7D3 /* DecodedDataDocumentParser.cpp in Sources */,
-                               4162A450101145AE00DFF3ED /* DedicatedWorkerContext.cpp in Sources */,
+                               4162A450101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp in Sources */,
                                41A3D58E101C152D00316D07 /* DedicatedWorkerThread.cpp in Sources */,
                                FD06DFA5134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp in Sources */,
                                4167EBF5102962BA003D252A /* DefaultSharedWorkerRepository.cpp in Sources */,
                                B58CEB6A11913607002A6790 /* JSDatabaseSync.cpp in Sources */,
                                2E97CE6F1293AD6B00C5C8FF /* JSDataView.cpp in Sources */,
                                2E97CCF71293A43A00C5C8FF /* JSDataViewCustom.cpp in Sources */,
-                               4162A4571011464700DFF3ED /* JSDedicatedWorkerContext.cpp in Sources */,
-                               4162A454101145E300DFF3ED /* JSDedicatedWorkerContextCustom.cpp in Sources */,
+                               4162A4571011464700DFF3ED /* JSDedicatedWorkerGlobalScope.cpp in Sources */,
+                               4162A454101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp in Sources */,
                                FDA15ED112B03F94003A583A /* JSDelayNode.cpp in Sources */,
                                31FB1A65120A5D3F00DC02A0 /* JSDeviceMotionEvent.cpp in Sources */,
                                31FB1A6C120A5D6900DC02A0 /* JSDeviceMotionEventCustom.cpp in Sources */,
                                9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */,
                                9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */,
                                41D07A7E0FF935CA0095EDCE /* JSSharedWorker.cpp in Sources */,
-                               41D1690510238B66009BC827 /* JSSharedWorkerContext.cpp in Sources */,
+                               41D1690510238B66009BC827 /* JSSharedWorkerGlobalScope.cpp in Sources */,
                                14CD8D82106B529000A46D23 /* JSSharedWorkerCustom.cpp in Sources */,
                                75415D59129AB2D2003AD669 /* JSSpeechInputResultList.cpp in Sources */,
                                AA7FEEA416A4E6F3004C0C33 /* JSSpeechSynthesis.cpp in Sources */,
                                5DA5E0FC102B953800088CF9 /* JSWebSocket.cpp in Sources */,
                                65DF320509D1CC60000BE325 /* JSWheelEvent.cpp in Sources */,
                                E1C8BE5D0E8BD15A0064CB7D /* JSWorker.cpp in Sources */,
-                               E182568F0EF2B02D00933242 /* JSWorkerContext.cpp in Sources */,
-                               E1C36D340EB0A094007410BC /* JSWorkerContextBase.cpp in Sources */,
-                               E18258AC0EF3CD7000933242 /* JSWorkerContextCustom.cpp in Sources */,
+                               E182568F0EF2B02D00933242 /* JSWorkerGlobalScope.cpp in Sources */,
+                               E1C36D340EB0A094007410BC /* JSWorkerGlobalScopeBase.cpp in Sources */,
+                               E18258AC0EF3CD7000933242 /* JSWorkerGlobalScopeCustom.cpp in Sources */,
                                E1CA5CBC0E8CDCAF00E8EF90 /* JSWorkerCustom.cpp in Sources */,
                                E1C362F00EAF2AA9007410BC /* JSWorkerLocation.cpp in Sources */,
                                E1271A590EEECDE400F61213 /* JSWorkerNavigator.cpp in Sources */,
                                E45390460EAFD637003695C8 /* SharedTimerIOS.mm in Sources */,
                                93309EA2099EB78C0056E581 /* SharedTimerMac.mm in Sources */,
                                41E1B1D30FF5986900576B3B /* SharedWorker.cpp in Sources */,
-                               41D168E710226E89009BC827 /* SharedWorkerContext.cpp in Sources */,
+                               41D168E710226E89009BC827 /* SharedWorkerGlobalScope.cpp in Sources */,
                                E1B784201639CBBE0007B692 /* SharedWorkerRepository.cpp in Sources */,
                                41D168ED10226E89009BC827 /* SharedWorkerThread.cpp in Sources */,
                                B2C3DA640D006CD600EF6F26 /* SimpleFontData.cpp in Sources */,
                                379919961200DDF400EA041C /* WOFFFileFormat.cpp in Sources */,
                                2E4346450F546A8200B0F1BA /* Worker.cpp in Sources */,
                                F3820896147D35F90010BC06 /* WorkerConsoleAgent.cpp in Sources */,
-                               2E4346480F546A8200B0F1BA /* WorkerContext.cpp in Sources */,
-                               9712A611150090CE0048AF10 /* WorkerContextIndexedDatabase.cpp in Sources */,
-                               97F8E665151D4A4B00D2D181 /* WorkerContextNotifications.cpp in Sources */,
-                               A8CCBB4C151F833B00AB7CE9 /* WorkerContextWebDatabase.cpp in Sources */,
+                               2E4346480F546A8200B0F1BA /* WorkerGlobalScope.cpp in Sources */,
+                               9712A611150090CE0048AF10 /* WorkerGlobalScopeIndexedDatabase.cpp in Sources */,
+                               97F8E665151D4A4B00D2D181 /* WorkerGlobalScopeNotifications.cpp in Sources */,
+                               A8CCBB4C151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp in Sources */,
                                F34742E01343631F00531BC2 /* WorkerDebuggerAgent.cpp in Sources */,
                                A3E2643014748991005A8588 /* WorkerEventQueue.cpp in Sources */,
                                F36E07A41358A8BE00AACBC9 /* WorkerInspectorController.cpp in Sources */,
index ae40d51..1ef1076 100644 (file)
 
 #include "DOMApplicationCache.h"
 #include "DOMWindow.h"
-#include "DedicatedWorkerContext.h"
+#include "DedicatedWorkerGlobalScope.h"
 #include "EventSource.h"
 #include "MessagePort.h"
 #include "Node.h"
 #include "Notification.h"
 #include "SharedWorker.h"
-#include "SharedWorkerContext.h"
+#include "SharedWorkerGlobalScope.h"
 #include "ThreadCheck.h"
 #include "WebDOMDOMApplicationCache.h"
 #include "WebDOMDOMWindow.h"
 #include <wtf/RefPtr.h>
 
 #if ENABLE(WORKERS)
-#include "WebDOMDedicatedWorkerContext.h"
+#include "WebDOMDedicatedWorkerGlobalScope.h"
 #include "WebDOMWorker.h"
 #endif
 
 #if ENABLE(SHARED_WORKERS)
 #include "WebDOMSharedWorker.h"
-#include "WebDOMSharedWorkerContext.h"
+#include "WebDOMSharedWorkerGlobalScope.h"
 #endif
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
@@ -114,12 +114,12 @@ ConvertTo(DOMWindow)
 
 #if ENABLE(WORKERS) && 0
 ConvertTo(Worker)
-ConvertTo(DedicatedWorkerContext)
+ConvertTo(DedicatedWorkerGlobalScope)
 #endif
 
 #if ENABLE(SHARED_WORKERS)
 ConvertTo(SharedWorker)
-ConvertTo(SharedWorkerContext)
+ConvertTo(SharedWorkerGlobalScope)
 #endif
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
@@ -154,16 +154,16 @@ WebDOMEventTarget toWebKit(WebCore::EventTarget* value)
     if (WebCore::Worker* worker = value->toWorker())
         return toWebKit(worker);
 
-    if (WebCore::DedicatedWorkerContext* workerContext = value->toDedicatedWorkerContext())
-        return toWebKit(workerContext);
+    if (WebCore::DedicatedWorkerGlobalScope* workerGlobalScope = value->toDedicatedWorkerGlobalScope())
+        return toWebKit(workerGlobalScope);
 #endif
 
 #if ENABLE(SHARED_WORKERS)
     if (WebCore::SharedWorker* sharedWorker = value->toSharedWorker())
         return toWebKit(sharedWorker);
 
-    if (WebCore::SharedWorkerContext* workerContext = value->toSharedWorkerContext())
-        return toWebKit(workerContext);
+    if (WebCore::SharedWorkerGlobalScope* workerGlobalScope = value->toSharedWorkerGlobalScope())
+        return toWebKit(workerGlobalScope);
 #endif
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
index fa4d9a2..f469091 100644 (file)
@@ -26,7 +26,7 @@ namespace WebCore {
 class EventTarget;
 };
 
-class WebDOMDedicatedWorkerContext;
+class WebDOMDedicatedWorkerGlobalScope;
 class WebDOMDOMApplicationCache;
 class WebDOMDOMWindow;
 class WebDOMEventSource;
@@ -34,7 +34,7 @@ class WebDOMMessagePort;
 class WebDOMNode;
 class WebDOMNotification;
 class WebDOMSharedWorker;
-class WebDOMSharedWorkerContext;
+class WebDOMSharedWorkerGlobalScope;
 class WebDOMWebSocket;
 class WebDOMWorker;
 class WebDOMXMLHttpRequest;
@@ -52,9 +52,9 @@ public:
     WebDOMNode toNode();
     WebDOMDOMWindow toDOMWindow();
     WebDOMWorker toWorker();
-    WebDOMDedicatedWorkerContext toDedicatedWorkerContext();
+    WebDOMDedicatedWorkerGlobalScope toDedicatedWorkerGlobalScope();
     WebDOMSharedWorker toSharedWorker();
-    WebDOMSharedWorkerContext toSharedWorkerContext();
+    WebDOMSharedWorkerGlobalScope toSharedWorkerGlobalScope();
     WebDOMNotification toNotification();
     WebDOMWebSocket toWebSocket();
 
index 9264a5c..0e326f7 100644 (file)
@@ -35,7 +35,7 @@
 #include "ScriptExecutionContext.h"
 
 #if ENABLE(WORKERS)
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #endif
 
 namespace WebCore {
index 41d336e..11e10bf 100644 (file)
@@ -32,7 +32,7 @@
 #include "Document.h"
 #include "ScriptState.h"
 #if ENABLE(WORKERS)
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #endif
 
 #include <JavaScriptCore/APIShims.h>
@@ -52,8 +52,8 @@ public:
             m_exec = scriptStateFromPage(mainThreadNormalWorld(), document->page());
         } else {
 #if ENABLE(WORKERS)
-            WorkerContext* workerContext = static_cast<WorkerContext*>(m_scriptExecutionContext);
-            m_exec = scriptStateFromWorkerContext(workerContext);
+            WorkerGlobalScope* workerGlobalScope = static_cast<WorkerGlobalScope*>(m_scriptExecutionContext);
+            m_exec = scriptStateFromWorkerGlobalScope(workerGlobalScope);
 #endif
         }
     }
index e3e7aea..3edbebf 100644 (file)
@@ -71,7 +71,7 @@
 #include "JSDOMWindowShell.cpp"
 #include "JSDOMWrapper.cpp"
 #include "JSDataViewCustom.cpp"
-#include "JSDedicatedWorkerContextCustom.cpp"
+#include "JSDedicatedWorkerGlobalScopeCustom.cpp"
 #include "JSDeviceOrientationEventCustom.cpp"
 #include "JSDocumentCustom.cpp"
 #include "JSElementCustom.cpp"
 #include "JSWebKitCSSKeyframeRuleCustom.cpp"
 #include "JSWebKitCSSKeyframesRuleCustom.cpp"
 #include "JSWebKitPointCustom.cpp"
-#include "JSWorkerContextBase.cpp"
-#include "JSWorkerContextCustom.cpp"
 #include "JSWorkerCustom.cpp"
+#include "JSWorkerGlobalScopeBase.cpp"
+#include "JSWorkerGlobalScopeCustom.cpp"
 #include "JSXMLHttpRequestCustom.cpp"
 #include "JSXMLHttpRequestUploadCustom.cpp"
 #include "JSXPathResultCustom.cpp"
index f813c0a..7ac5c12 100644 (file)
@@ -77,7 +77,7 @@ class DOMStringList;
     };
 
     // Constructors using this base class depend on being in a Document and
-    // can never be used from a WorkerContext.
+    // can never be used from a WorkerGlobalScope.
     class DOMConstructorWithDocument : public DOMConstructorObject {
         typedef DOMConstructorObject Base;
     public:
index 6a336de..1cdb4cf 100644 (file)
@@ -32,8 +32,8 @@
 #include "JSEventListener.h"
 
 #if ENABLE(WORKERS)
-#include "JSWorkerContext.h"
-#include "WorkerContext.h"
+#include "JSWorkerGlobalScope.h"
+#include "WorkerGlobalScope.h"
 #endif
 
 using namespace JSC;
@@ -71,8 +71,8 @@ ScriptExecutionContext* JSDOMGlobalObject::scriptExecutionContext() const
     if (inherits(&JSDOMWindowBase::s_info))
         return jsCast<const JSDOMWindowBase*>(this)->scriptExecutionContext();
 #if ENABLE(WORKERS)
-    if (inherits(&JSWorkerContextBase::s_info))
-        return jsCast<const JSWorkerContextBase*>(this)->scriptExecutionContext();
+    if (inherits(&JSWorkerGlobalScopeBase::s_info))
+        return jsCast<const JSWorkerGlobalScopeBase*>(this)->scriptExecutionContext();
 #endif
     ASSERT_NOT_REACHED();
     return 0;
@@ -116,8 +116,8 @@ JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext* scriptExecutionCo
         return toJSDOMGlobalObject(toDocument(scriptExecutionContext), exec);
 
 #if ENABLE(WORKERS)
-    if (scriptExecutionContext->isWorkerContext())
-        return static_cast<WorkerContext*>(scriptExecutionContext)->script()->workerContextWrapper();
+    if (scriptExecutionContext->isWorkerGlobalScope())
+        return static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->workerGlobalScopeWrapper();
 #endif
 
     ASSERT_NOT_REACHED();
@@ -135,8 +135,8 @@ JSDOMGlobalObject* toJSDOMGlobalObject(ScriptExecutionContext* scriptExecutionCo
         return toJSDOMGlobalObject(toDocument(scriptExecutionContext), world);
 
 #if ENABLE(WORKERS)
-    if (scriptExecutionContext->isWorkerContext())
-        return static_cast<WorkerContext*>(scriptExecutionContext)->script()->workerContextWrapper();
+    if (scriptExecutionContext->isWorkerGlobalScope())
+        return static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->workerGlobalScopeWrapper();
 #endif
 
     ASSERT_NOT_REACHED();
@@ -33,7 +33,7 @@
 
 #if ENABLE(WORKERS)
 
-#include "JSDedicatedWorkerContext.h"
+#include "JSDedicatedWorkerGlobalScope.h"
 
 #include "JSDOMBinding.h"
 #include "JSMessagePortCustom.h"
@@ -42,7 +42,7 @@ using namespace JSC;
 
 namespace WebCore {
 
-JSC::JSValue JSDedicatedWorkerContext::postMessage(JSC::ExecState* exec)
+JSC::JSValue JSDedicatedWorkerGlobalScope::postMessage(JSC::ExecState* exec)
 {
     return handlePostMessage(exec, impl());
 }
index ba609f9..6ba8727 100644 (file)
@@ -27,7 +27,7 @@
 #include "JSEventTarget.h"
 #include "JSMainThreadExecState.h"
 #include "ScriptController.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include <runtime/ExceptionHelpers.h>
 #include <runtime/JSLock.h>
 #include <wtf/RefCountedLeakCounter.h>
@@ -134,10 +134,10 @@ void JSEventListener::handleEvent(ScriptExecutionContext* scriptExecutionContext
         globalObject->setCurrentEvent(savedEvent);
 
 #if ENABLE(WORKERS)
-        if (scriptExecutionContext->isWorkerContext()) {
+        if (scriptExecutionContext->isWorkerGlobalScope()) {
             bool terminatorCausedException = (exec->hadException() && isTerminatedExecutionException(exec->exception()));
             if (terminatorCausedException || vm.watchdog.didFire())
-                static_cast<WorkerContext*>(scriptExecutionContext)->script()->forbidExecution();
+                static_cast<WorkerGlobalScope*>(scriptExecutionContext)->script()->forbidExecution();
         }
 #endif
 
index 36c48f6..10855ee 100644 (file)
@@ -48,12 +48,12 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, EventTarget* targ
 
     // FIXME: Why can't we use toJS for these cases?
 #if ENABLE(WORKERS)
-    if (eventNames().interfaceForDedicatedWorkerContext == desiredInterface)
-        return toJSDOMGlobalObject(static_cast<DedicatedWorkerContext*>(target), exec);
+    if (eventNames().interfaceForDedicatedWorkerGlobalScope == desiredInterface)
+        return toJSDOMGlobalObject(static_cast<DedicatedWorkerGlobalScope*>(target), exec);
 #endif
 #if ENABLE(SHARED_WORKERS)
-    if (eventNames().interfaceForSharedWorkerContext == desiredInterface)
-        return toJSDOMGlobalObject(static_cast<SharedWorkerContext*>(target), exec);
+    if (eventNames().interfaceForSharedWorkerGlobalScope == desiredInterface)
+        return toJSDOMGlobalObject(static_cast<SharedWorkerGlobalScope*>(target), exec);
 #endif
 
     DOM_EVENT_TARGET_INTERFACES_FOR_EACH(TRY_TO_WRAP_WITH_INTERFACE)
 
 #if ENABLE(WORKERS)
 
-#include "JSWorkerContextBase.h"
+#include "JSWorkerGlobalScopeBase.h"
 
 #include "DOMWrapperWorld.h"
-#include "JSDedicatedWorkerContext.h"
-#include "JSWorkerContext.h"
-#include "WorkerContext.h"
+#include "JSDedicatedWorkerGlobalScope.h"
+#include "JSWorkerGlobalScope.h"
+#include "WorkerGlobalScope.h"
 
 #if ENABLE(SHARED_WORKERS)
-#include "JSSharedWorkerContext.h"
+#include "JSSharedWorkerGlobalScope.h"
 #endif
 
 using namespace JSC;
 
 namespace WebCore {
 
-const ClassInfo JSWorkerContextBase::s_info = { "WorkerContext", &JSDOMGlobalObject::s_info, 0, 0, CREATE_METHOD_TABLE(JSWorkerContextBase) };
+const ClassInfo JSWorkerGlobalScopeBase::s_info = { "WorkerGlobalScope", &JSDOMGlobalObject::s_info, 0, 0, CREATE_METHOD_TABLE(JSWorkerGlobalScopeBase) };
 
-JSWorkerContextBase::JSWorkerContextBase(JSC::VM& vm, JSC::Structure* structure, PassRefPtr<WorkerContext> impl)
+JSWorkerGlobalScopeBase::JSWorkerGlobalScopeBase(JSC::VM& vm, JSC::Structure* structure, PassRefPtr<WorkerGlobalScope> impl)
     : JSDOMGlobalObject(vm, structure, normalWorld(vm))
     , m_impl(impl)
 {
 }
 
-void JSWorkerContextBase::finishCreation(VM& vm)
+void JSWorkerGlobalScopeBase::finishCreation(VM& vm)
 {
     Base::finishCreation(vm);
     ASSERT(inherits(&s_info));
 }
 
-void JSWorkerContextBase::destroy(JSCell* cell)
+void JSWorkerGlobalScopeBase::destroy(JSCell* cell)
 {
-    static_cast<JSWorkerContextBase*>(cell)->JSWorkerContextBase::~JSWorkerContextBase();
+    static_cast<JSWorkerGlobalScopeBase*>(cell)->JSWorkerGlobalScopeBase::~JSWorkerGlobalScopeBase();
 }
 
-ScriptExecutionContext* JSWorkerContextBase::scriptExecutionContext() const
+ScriptExecutionContext* JSWorkerGlobalScopeBase::scriptExecutionContext() const
 {
     return m_impl.get();
 }
 
-JSValue toJS(ExecState* exec, JSDOMGlobalObject*, WorkerContext* workerContext)
+JSValue toJS(ExecState* exec, JSDOMGlobalObject*, WorkerGlobalScope* workerGlobalScope)
 {
-    return toJS(exec, workerContext);
+    return toJS(exec, workerGlobalScope);
 }
 
-JSValue toJS(ExecState*, WorkerContext* workerContext)
+JSValue toJS(ExecState*, WorkerGlobalScope* workerGlobalScope)
 {
-    if (!workerContext)
+    if (!workerGlobalScope)
         return jsNull();
-    WorkerScriptController* script = workerContext->script();
+    WorkerScriptController* script = workerGlobalScope->script();
     if (!script)
         return jsNull();
-    JSWorkerContext* contextWrapper = script->workerContextWrapper();
+    JSWorkerGlobalScope* contextWrapper = script->workerGlobalScopeWrapper();
     ASSERT(contextWrapper);
     return contextWrapper;
 }
 
-JSDedicatedWorkerContext* toJSDedicatedWorkerContext(JSValue value)
+JSDedicatedWorkerGlobalScope* toJSDedicatedWorkerGlobalScope(JSValue value)
 {
     if (!value.isObject())
         return 0;
     const ClassInfo* classInfo = asObject(value)->classInfo();
-    if (classInfo == &JSDedicatedWorkerContext::s_info)
-        return jsCast<JSDedicatedWorkerContext*>(asObject(value));
+    if (classInfo == &JSDedicatedWorkerGlobalScope::s_info)
+        return jsCast<JSDedicatedWorkerGlobalScope*>(asObject(value));
     return 0;
 }
 
 #if ENABLE(SHARED_WORKERS)
-JSSharedWorkerContext* toJSSharedWorkerContext(JSValue value)
+JSSharedWorkerGlobalScope* toJSSharedWorkerGlobalScope(JSValue value)
 {
     if (!value.isObject())
         return 0;
     const ClassInfo* classInfo = asObject(value)->classInfo();
-    if (classInfo == &JSSharedWorkerContext::s_info)
-        return jsCast<JSSharedWorkerContext*>(asObject(value));
+    if (classInfo == &JSSharedWorkerGlobalScope::s_info)
+        return jsCast<JSSharedWorkerGlobalScope*>(asObject(value));
     return 0;
 }
 #endif
 
-JSWorkerContext* toJSWorkerContext(JSValue value)
+JSWorkerGlobalScope* toJSWorkerGlobalScope(JSValue value)
 {
-    JSWorkerContext* context = toJSDedicatedWorkerContext(value);
+    JSWorkerGlobalScope* context = toJSDedicatedWorkerGlobalScope(value);
 #if ENABLE(SHARED_WORKERS)
     if (!context)
-        context = toJSSharedWorkerContext(value);
+        context = toJSSharedWorkerGlobalScope(value);
 #endif
     return context;
 }
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef JSWorkerContextBase_h
-#define JSWorkerContextBase_h
+#ifndef JSWorkerGlobalScopeBase_h
+#define JSWorkerGlobalScopeBase_h
 
 #if ENABLE(WORKERS)
 
 
 namespace WebCore {
 
-    class JSDedicatedWorkerContext;
-    class JSSharedWorkerContext;
-    class JSWorkerContext;
-    class WorkerContext;
+    class JSDedicatedWorkerGlobalScope;
+    class JSSharedWorkerGlobalScope;
+    class JSWorkerGlobalScope;
+    class WorkerGlobalScope;
 
-    class JSWorkerContextBase : public JSDOMGlobalObject {
+    class JSWorkerGlobalScopeBase : public JSDOMGlobalObject {
         typedef JSDOMGlobalObject Base;
     public:
         static void destroy(JSC::JSCell*);
 
         static const JSC::ClassInfo s_info;
 
-        WorkerContext* impl() const { return m_impl.get(); }
+        WorkerGlobalScope* impl() const { return m_impl.get(); }
         ScriptExecutionContext* scriptExecutionContext() const;
 
         static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
@@ -54,27 +54,27 @@ namespace WebCore {
         }
 
     protected:
-        JSWorkerContextBase(JSC::VM&, JSC::Structure*, PassRefPtr<WorkerContext>);
+        JSWorkerGlobalScopeBase(JSC::VM&, JSC::Structure*, PassRefPtr<WorkerGlobalScope>);
         void finishCreation(JSC::VM&);
 
     private:
-        RefPtr<WorkerContext> m_impl;
+        RefPtr<WorkerGlobalScope> m_impl;
     };
 
-    // Returns a JSWorkerContext or jsNull()
-    // Always ignores the execState and passed globalObject, WorkerContext is itself a globalObject and will always use its own prototype chain.
-    JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, WorkerContext*);
-    JSC::JSValue toJS(JSC::ExecState*, WorkerContext*);
+    // Returns a JSWorkerGlobalScope or jsNull()
+    // Always ignores the execState and passed globalObject, WorkerGlobalScope is itself a globalObject and will always use its own prototype chain.
+    JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, WorkerGlobalScope*);
+    JSC::JSValue toJS(JSC::ExecState*, WorkerGlobalScope*);
 
-    JSDedicatedWorkerContext* toJSDedicatedWorkerContext(JSC::JSValue);
-    JSWorkerContext* toJSWorkerContext(JSC::JSValue);
+    JSDedicatedWorkerGlobalScope* toJSDedicatedWorkerGlobalScope(JSC::JSValue);
+    JSWorkerGlobalScope* toJSWorkerGlobalScope(JSC::JSValue);
 
 #if ENABLE(SHARED_WORKERS)
-    JSSharedWorkerContext* toJSSharedWorkerContext(JSC::JSValue);
+    JSSharedWorkerGlobalScope* toJSSharedWorkerGlobalScope(JSC::JSValue);
 #endif
 
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS)
 
-#endif // JSWorkerContextBase_h
+#endif // JSWorkerGlobalScopeBase_h
@@ -27,7 +27,7 @@
 
 #if ENABLE(WORKERS)
 
-#include "JSWorkerContext.h"
+#include "JSWorkerGlobalScope.h"
 
 #include "ExceptionCode.h"
 #include "JSDOMBinding.h"
@@ -40,7 +40,7 @@
 #include "JSWorkerNavigator.h"
 #include "JSXMLHttpRequest.h"
 #include "ScheduledAction.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerLocation.h"
 #include "WorkerNavigator.h"
 #include <interpreter/Interpreter.h>
@@ -53,9 +53,9 @@ using namespace JSC;
 
 namespace WebCore {
 
-void JSWorkerContext::visitChildren(JSCell* cell, SlotVisitor& visitor)
+void JSWorkerGlobalScope::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
-    JSWorkerContext* thisObject = jsCast<JSWorkerContext*>(cell);
+    JSWorkerGlobalScope* thisObject = jsCast<JSWorkerGlobalScope*>(cell);
     ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
     COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
     ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
@@ -69,7 +69,7 @@ void JSWorkerContext::visitChildren(JSCell* cell, SlotVisitor& visitor)
     thisObject->impl()->visitJSEventListeners(visitor);
 }
 
-bool JSWorkerContext::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
+bool JSWorkerGlobalScope::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
 {
     // Look for overrides before looking at any of our own properties.
     if (JSGlobalObject::getOwnPropertySlot(this, exec, propertyName, slot))
@@ -77,7 +77,7 @@ bool JSWorkerContext::getOwnPropertySlotDelegate(ExecState* exec, PropertyName p
     return false;
 }
 
-bool JSWorkerContext::getOwnPropertyDescriptorDelegate(ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
+bool JSWorkerGlobalScope::getOwnPropertyDescriptorDelegate(ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
 {
     // Look for overrides before looking at any of our own properties.
     if (JSGlobalObject::getOwnPropertyDescriptor(this, exec, propertyName, descriptor))
@@ -85,7 +85,7 @@ bool JSWorkerContext::getOwnPropertyDescriptorDelegate(ExecState* exec, Property
     return false;
 }
 
-JSValue JSWorkerContext::importScripts(ExecState* exec)
+JSValue JSWorkerGlobalScope::importScripts(ExecState* exec)
 {
     if (!exec->argumentCount())
         return jsUndefined();
@@ -103,7 +103,7 @@ JSValue JSWorkerContext::importScripts(ExecState* exec)
     return jsUndefined();
 }
 
-JSValue JSWorkerContext::setTimeout(ExecState* exec)
+JSValue JSWorkerGlobalScope::setTimeout(ExecState* exec)
 {
     OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec), impl()->contentSecurityPolicy());
     if (exec->hadException())
@@ -114,7 +114,7 @@ JSValue JSWorkerContext::setTimeout(ExecState* exec)
     return jsNumber(impl()->setTimeout(action.release(), delay));
 }
 
-JSValue JSWorkerContext::setInterval(ExecState* exec)
+JSValue JSWorkerGlobalScope::setInterval(ExecState* exec)
 {
     OwnPtr<ScheduledAction> action = ScheduledAction::create(exec, currentWorld(exec), impl()->contentSecurityPolicy());
     if (exec->hadException())
index e7b529d..4e38cd9 100644 (file)
@@ -39,8 +39,8 @@
 #include <runtime/JSLock.h>
 
 #if ENABLE(WORKERS)
-#include "JSWorkerContext.h"
-#include "WorkerContext.h"
+#include "JSWorkerGlobalScope.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerThread.h"
 #endif
 
@@ -80,8 +80,8 @@ void ScheduledAction::execute(ScriptExecutionContext* context)
         execute(toDocument(context));
 #if ENABLE(WORKERS)
     else {
-        ASSERT(context->isWorkerContext());
-        execute(static_cast<WorkerContext*>(context));
+        ASSERT(context->isWorkerGlobalScope());
+        execute(static_cast<WorkerGlobalScope*>(context));
     }
 #else
     ASSERT(context->isDocument());
@@ -135,18 +135,18 @@ void ScheduledAction::execute(Document* document)
 }
 
 #if ENABLE(WORKERS)
-void ScheduledAction::execute(WorkerContext* workerContext)
+void ScheduledAction::execute(WorkerGlobalScope* workerGlobalScope)
 {
     // In a Worker, the execution should always happen on a worker thread.
-    ASSERT(workerContext->thread()->threadID() == currentThread());
+    ASSERT(workerGlobalScope->thread()->threadID() == currentThread());
 
-    WorkerScriptController* scriptController = workerContext->script();
+    WorkerScriptController* scriptController = workerGlobalScope->script();
 
     if (m_function) {
-        JSWorkerContext* contextWrapper = scriptController->workerContextWrapper();
-        executeFunctionInContext(contextWrapper, contextWrapper, workerContext);
+        JSWorkerGlobalScope* contextWrapper = scriptController->workerGlobalScopeWrapper();
+        executeFunctionInContext(contextWrapper, contextWrapper, workerGlobalScope);
     } else {
-        ScriptSourceCode code(m_code, workerContext->url());
+        ScriptSourceCode code(m_code, workerGlobalScope->url());
         scriptController->evaluate(code);
     }
 }
index f22063e..ab02d8b 100644 (file)
@@ -37,7 +37,7 @@ namespace WebCore {
     class Document;
     class ContentSecurityPolicy;
     class ScriptExecutionContext;
-    class WorkerContext;
+    class WorkerGlobalScope;
 
    /* An action (either function or string) to be executed after a specified
     * time interval, either once or repeatedly. Used for window.setTimeout()
@@ -62,7 +62,7 @@ namespace WebCore {
         void executeFunctionInContext(JSC::JSGlobalObject*, JSC::JSValue thisValue, ScriptExecutionContext*);
         void execute(Document*);
 #if ENABLE(WORKERS)
-        void execute(WorkerContext*);
+        void execute(WorkerGlobalScope*);
 #endif
 
         JSC::Strong<JSC::Unknown> m_function;
index 21899c1..a61d53d 100644 (file)
@@ -69,9 +69,9 @@ void ScriptProfiler::startForPage(Page* inspectedPage, const String& title)
 }
 
 #if ENABLE(WORKERS)
-void ScriptProfiler::startForWorkerContext(WorkerContext* context, const String& title)
+void ScriptProfiler::startForWorkerGlobalScope(WorkerGlobalScope* context, const String& title)
 {
-    start(scriptStateFromWorkerContext(context), title);
+    start(scriptStateFromWorkerGlobalScope(context), title);
 }
 #endif
 
@@ -88,9 +88,9 @@ PassRefPtr<ScriptProfile> ScriptProfiler::stopForPage(Page* inspectedPage, const
 }
 
 #if ENABLE(WORKERS)
-PassRefPtr<ScriptProfile> ScriptProfiler::stopForWorkerContext(WorkerContext* context, const String& title)
+PassRefPtr<ScriptProfile> ScriptProfiler::stopForWorkerGlobalScope(WorkerGlobalScope* context, const String& title)
 {
-    return stop(scriptStateFromWorkerContext(context), title);
+    return stop(scriptStateFromWorkerGlobalScope(context), title);
 }
 #endif
 
index cc8f13c..ac627a1 100644 (file)
@@ -42,7 +42,7 @@ class WrappedNodeVisitor;
 class Page;
 class ScriptObject;
 class ScriptValue;
-class WorkerContext;
+class WorkerGlobalScope;
 
 class ScriptProfiler {
     WTF_MAKE_NONCOPYABLE(ScriptProfiler);
@@ -62,12 +62,12 @@ public:
     static void start(ScriptState* state, const String& title);
     static void startForPage(Page*, const String& title);
 #if ENABLE(WORKERS)
-    static void startForWorkerContext(WorkerContext*, const String& title);
+    static void startForWorkerGlobalScope(WorkerGlobalScope*, const String& title);
 #endif
     static PassRefPtr<ScriptProfile> stop(ScriptState* state, const String& title);
     static PassRefPtr<ScriptProfile> stopForPage(Page*, const String& title);
 #if ENABLE(WORKERS)
-    static PassRefPtr<ScriptProfile> stopForWorkerContext(WorkerContext*, const String& title);
+    static PassRefPtr<ScriptProfile> stopForWorkerGlobalScope(WorkerGlobalScope*, const String& title);
 #endif
     static PassRefPtr<ScriptHeapSnapshot> takeHeapSnapshot(const String&, HeapSnapshotProgress*) { return 0; }
     static bool causesRecompilation() { return true; }
index 0f3ccb3..8b22a33 100644 (file)
 #include "Node.h"
 #include "Page.h"
 #include "ScriptController.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerScriptController.h"
 #include <heap/StrongInlines.h>
 #include <interpreter/CallFrame.h>
 #include <runtime/JSGlobalObject.h>
 
 #if ENABLE(WORKERS)
-#include "JSWorkerContext.h"
+#include "JSWorkerGlobalScope.h"
 #endif
 
 namespace WebCore {
@@ -93,9 +93,9 @@ ScriptState* scriptStateFromPage(DOMWrapperWorld* world, Page* page)
 }
 
 #if ENABLE(WORKERS)
-ScriptState* scriptStateFromWorkerContext(WorkerContext* workerContext)
+ScriptState* scriptStateFromWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
 {
-    return workerContext->script()->workerContextWrapper()->globalExec();
+    return workerGlobalScope->script()->workerGlobalScopeWrapper()->globalExec();
 }
 #endif
 
index 4b81693..501f3e4 100644 (file)
@@ -44,7 +44,7 @@ class Frame;
 class Node;
 class Page;
 class ScriptExecutionContext;
-class WorkerContext;
+class WorkerGlobalScope;
 
 // The idea is to expose "state-like" methods (hadException, and any other
 // methods where ExecState just dips into vm) of JSC::ExecState as a
@@ -61,7 +61,7 @@ ScriptState* scriptStateFromNode(DOMWrapperWorld*, Node*);
 ScriptState* scriptStateFromPage(DOMWrapperWorld*, Page*);
 
 #if ENABLE(WORKERS)
-ScriptState* scriptStateFromWorkerContext(WorkerContext*);
+ScriptState* scriptStateFromWorkerGlobalScope(WorkerGlobalScope*);
 #endif
 
 } // namespace WebCore
index c3ad58c..e2acaec 100644 (file)
 #include "WorkerScriptController.h"
 
 #include "JSDOMBinding.h"
-#include "JSDedicatedWorkerContext.h"
+#include "JSDedicatedWorkerGlobalScope.h"
 #include "ScriptSourceCode.h"
 #include "ScriptValue.h"
 #include "WebCoreJSClientData.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerObjectProxy.h"
 #include "WorkerScriptDebugServer.h"
 #include "WorkerThread.h"
 #include <runtime/JSLock.h>
 
 #if ENABLE(SHARED_WORKERS)
-#include "JSSharedWorkerContext.h"
+#include "JSSharedWorkerGlobalScope.h"
 #endif
 
 using namespace JSC;
 
 namespace WebCore {
 
-WorkerScriptController::WorkerScriptController(WorkerContext* workerContext)
+WorkerScriptController::WorkerScriptController(WorkerGlobalScope* workerGlobalScope)
     : m_vm(VM::create())
-    , m_workerContext(workerContext)
-    , m_workerContextWrapper(*m_vm)
+    , m_workerGlobalScope(workerGlobalScope)
+    , m_workerGlobalScopeWrapper(*m_vm)
     , m_executionForbidden(false)
 {
     initNormalWorldClientData(m_vm.get());
@@ -67,48 +67,48 @@ WorkerScriptController::WorkerScriptController(WorkerContext* workerContext)
 WorkerScriptController::~WorkerScriptController()
 {
     JSLockHolder lock(vm());
-    m_workerContextWrapper.clear();
+    m_workerGlobalScopeWrapper.clear();
     m_vm.clear();
 }
 
 void WorkerScriptController::initScript()
 {
-    ASSERT(!m_workerContextWrapper);
+    ASSERT(!m_workerGlobalScopeWrapper);
 
     JSLockHolder lock(m_vm.get());
 
     // Explicitly protect the global object's prototype so it isn't collected
     // when we allocate the global object. (Once the global object is fully
     // constructed, it can mark its own prototype.)
-    Structure* workerContextPrototypeStructure = JSWorkerContextPrototype::createStructure(*m_vm, 0, jsNull());
-    Strong<JSWorkerContextPrototype> workerContextPrototype(*m_vm, JSWorkerContextPrototype::create(*m_vm, 0, workerContextPrototypeStructure));
-
-    if (m_workerContext->isDedicatedWorkerContext()) {
-        Structure* dedicatedContextPrototypeStructure = JSDedicatedWorkerContextPrototype::createStructure(*m_vm, 0, workerContextPrototype.get());
-        Strong<JSDedicatedWorkerContextPrototype> dedicatedContextPrototype(*m_vm, JSDedicatedWorkerContextPrototype::create(*m_vm, 0, dedicatedContextPrototypeStructure));
-        Structure* structure = JSDedicatedWorkerContext::createStructure(*m_vm, 0, dedicatedContextPrototype.get());
-
-        m_workerContextWrapper.set(*m_vm, JSDedicatedWorkerContext::create(*m_vm, structure, static_cast<DedicatedWorkerContext*>(m_workerContext)));
-        workerContextPrototypeStructure->setGlobalObject(*m_vm, m_workerContextWrapper.get());
-        dedicatedContextPrototypeStructure->setGlobalObject(*m_vm, m_workerContextWrapper.get());
-        ASSERT(structure->globalObject() == m_workerContextWrapper);
-        ASSERT(m_workerContextWrapper->structure()->globalObject() == m_workerContextWrapper);
-        workerContextPrototype->structure()->setGlobalObject(*m_vm, m_workerContextWrapper.get());
-        dedicatedContextPrototype->structure()->setGlobalObject(*m_vm, m_workerContextWrapper.get());
+    Structure* workerGlobalScopePrototypeStructure = JSWorkerGlobalScopePrototype::createStructure(*m_vm, 0, jsNull());
+    Strong<JSWorkerGlobalScopePrototype> workerGlobalScopePrototype(*m_vm, JSWorkerGlobalScopePrototype::create(*m_vm, 0, workerGlobalScopePrototypeStructure));
+
+    if (m_workerGlobalScope->isDedicatedWorkerGlobalScope()) {
+        Structure* dedicatedContextPrototypeStructure = JSDedicatedWorkerGlobalScopePrototype::createStructure(*m_vm, 0, workerGlobalScopePrototype.get());
+        Strong<JSDedicatedWorkerGlobalScopePrototype> dedicatedContextPrototype(*m_vm, JSDedicatedWorkerGlobalScopePrototype::create(*m_vm, 0, dedicatedContextPrototypeStructure));
+        Structure* structure = JSDedicatedWorkerGlobalScope::createStructure(*m_vm, 0, dedicatedContextPrototype.get());
+
+        m_workerGlobalScopeWrapper.set(*m_vm, JSDedicatedWorkerGlobalScope::create(*m_vm, structure, static_cast<DedicatedWorkerGlobalScope*>(m_workerGlobalScope)));
+        workerGlobalScopePrototypeStructure->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
+        dedicatedContextPrototypeStructure->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
+        ASSERT(structure->globalObject() == m_workerGlobalScopeWrapper);
+        ASSERT(m_workerGlobalScopeWrapper->structure()->globalObject() == m_workerGlobalScopeWrapper);
+        workerGlobalScopePrototype->structure()->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
+        dedicatedContextPrototype->structure()->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
 #if ENABLE(SHARED_WORKERS)
     } else {
-        ASSERT(m_workerContext->isSharedWorkerContext());
-        Structure* sharedContextPrototypeStructure = JSSharedWorkerContextPrototype::createStructure(*m_vm, 0, workerContextPrototype.get());
-        Strong<JSSharedWorkerContextPrototype> sharedContextPrototype(*m_vm, JSSharedWorkerContextPrototype::create(*m_vm, 0, sharedContextPrototypeStructure));
-        Structure* structure = JSSharedWorkerContext::createStructure(*m_vm, 0, sharedContextPrototype.get());
-
-        m_workerContextWrapper.set(*m_vm, JSSharedWorkerContext::create(*m_vm, structure, static_cast<SharedWorkerContext*>(m_workerContext)));
-        workerContextPrototype->structure()->setGlobalObject(*m_vm, m_workerContextWrapper.get());
-        sharedContextPrototype->structure()->setGlobalObject(*m_vm, m_workerContextWrapper.get());
+        ASSERT(m_workerGlobalScope->isSharedWorkerGlobalScope());
+        Structure* sharedContextPrototypeStructure = JSSharedWorkerGlobalScopePrototype::createStructure(*m_vm, 0, workerGlobalScopePrototype.get());
+        Strong<JSSharedWorkerGlobalScopePrototype> sharedContextPrototype(*m_vm, JSSharedWorkerGlobalScopePrototype::create(*m_vm, 0, sharedContextPrototypeStructure));
+        Structure* structure = JSSharedWorkerGlobalScope::createStructure(*m_vm, 0, sharedContextPrototype.get());
+
+        m_workerGlobalScopeWrapper.set(*m_vm, JSSharedWorkerGlobalScope::create(*m_vm, structure, static_cast<SharedWorkerGlobalScope*>(m_workerGlobalScope)));
+        workerGlobalScopePrototype->structure()->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
+        sharedContextPrototype->structure()->setGlobalObject(*m_vm, m_workerGlobalScopeWrapper.get());
 #endif
     }
-    ASSERT(m_workerContextWrapper->globalObject() == m_workerContextWrapper);
-    ASSERT(asObject(m_workerContextWrapper->prototype())->globalObject() == m_workerContextWrapper);
+    ASSERT(m_workerGlobalScopeWrapper->globalObject() == m_workerGlobalScopeWrapper);
+    ASSERT(asObject(m_workerGlobalScopeWrapper->prototype())->globalObject() == m_workerGlobalScopeWrapper);
 }
 
 void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode)
@@ -120,7 +120,7 @@ void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode)
     evaluate(sourceCode, &exception);
     if (exception.jsValue()) {
         JSLockHolder lock(vm());
-        reportException(m_workerContextWrapper->globalExec(), exception.jsValue());
+        reportException(m_workerGlobalScopeWrapper->globalExec(), exception.jsValue());
     }
 }
 
@@ -131,13 +131,13 @@ void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, Script
 
     initScriptIfNeeded();
 
-    ExecState* exec = m_workerContextWrapper->globalExec();
+    ExecState* exec = m_workerGlobalScopeWrapper->globalExec();
     JSLockHolder lock(exec);
 
     JSValue evaluationException;
-    JSC::evaluate(exec, sourceCode.jsSourceCode(), m_workerContextWrapper.get(), &evaluationException);
+    JSC::evaluate(exec, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper.get(), &evaluationException);
 
-    if ((evaluationException && isTerminatedExecutionException(evaluationException)) ||  m_workerContextWrapper->vm().watchdog.didFire()) {
+    if ((evaluationException && isTerminatedExecutionException(evaluationException)) ||  m_workerGlobalScopeWrapper->vm().watchdog.didFire()) {
         forbidExecution();
         return;
     }
@@ -146,7 +146,7 @@ void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, Script
         String errorMessage;
         int lineNumber = 0;
         String sourceURL = sourceCode.url().string();
-        if (m_workerContext->sanitizeScriptError(errorMessage, lineNumber, sourceURL, sourceCode.cachedScript()))
+        if (m_workerGlobalScope->sanitizeScriptError(errorMessage, lineNumber, sourceURL, sourceCode.cachedScript()))
             *exception = ScriptValue(*m_vm, throwError(exec, createError(exec, errorMessage.impl())));
         else
             *exception = ScriptValue(*m_vm, evaluationException);
@@ -155,7 +155,7 @@ void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, Script
 
 void WorkerScriptController::setException(const ScriptValue& exception)
 {
-    throwError(m_workerContextWrapper->globalExec(), exception.jsValue());
+    throwError(m_workerGlobalScopeWrapper->globalExec(), exception.jsValue());
 }
 
 void WorkerScriptController::scheduleExecutionTermination()
@@ -176,13 +176,13 @@ bool WorkerScriptController::isExecutionTerminating() const
 
 void WorkerScriptController::forbidExecution()
 {
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
     m_executionForbidden = true;
 }
 
 bool WorkerScriptController::isExecutionForbidden() const
 {
-    ASSERT(m_workerContext->isContextThread());
+    ASSERT(m_workerGlobalScope->isContextThread());
     return m_executionForbidden;
 }
 
@@ -191,18 +191,18 @@ void WorkerScriptController::disableEval(const String& errorMessage)
     initScriptIfNeeded();
     JSLockHolder lock(vm());
 
-    m_workerContextWrapper->setEvalEnabled(false, errorMessage);
+    m_workerGlobalScopeWrapper->setEvalEnabled(false, errorMessage);
 }
 
 void WorkerScriptController::attachDebugger(JSC::Debugger* debugger)
 {
     initScriptIfNeeded();
-    debugger->attach(m_workerContextWrapper->globalObject());
+    debugger->attach(m_workerGlobalScopeWrapper->globalObject());
 }
 
 void WorkerScriptController::detachDebugger(JSC::Debugger* debugger)
 {
-    debugger->detach(m_workerContextWrapper->globalObject());
+    debugger->detach(m_workerGlobalScopeWrapper->globalObject());
 }
 
 } // namespace WebCore
index cff0cb5..34305b6 100644 (file)
@@ -40,21 +40,21 @@ namespace JSC {
 
 namespace WebCore {
 
-    class JSWorkerContext;
+    class JSWorkerGlobalScope;
     class ScriptSourceCode;
     class ScriptValue;
-    class WorkerContext;
+    class WorkerGlobalScope;
 
     class WorkerScriptController {
         WTF_MAKE_NONCOPYABLE(WorkerScriptController); WTF_MAKE_FAST_ALLOCATED;
     public:
-        WorkerScriptController(WorkerContext*);
+        WorkerScriptController(WorkerGlobalScope*);
         ~WorkerScriptController();
 
-        JSWorkerContext* workerContextWrapper()
+        JSWorkerGlobalScope* workerGlobalScopeWrapper()
         {
             initScriptIfNeeded();
-            return m_workerContextWrapper.get();
+            return m_workerGlobalScopeWrapper.get();
         }
 
         void evaluate(const ScriptSourceCode&);
@@ -85,14 +85,14 @@ namespace WebCore {
     private:
         void initScriptIfNeeded()
         {
-            if (!m_workerContextWrapper)
+            if (!m_workerGlobalScopeWrapper)
                 initScript();
         }
         void initScript();
 
         RefPtr<JSC::VM> m_vm;
-        WorkerContext* m_workerContext;
-        JSC::Strong<JSWorkerContext> m_workerContextWrapper;
+        WorkerGlobalScope* m_workerGlobalScope;
+        JSC::Strong<JSWorkerGlobalScope> m_workerGlobalScopeWrapper;
         bool m_executionForbidden;
         mutable Mutex m_scheduledTerminationMutex;
     };
index bd02a8b..6d16b09 100644 (file)
@@ -33,8 +33,8 @@
 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(WORKERS)
 #include "WorkerScriptDebugServer.h"
 
-#include "WorkerContext.h"
 #include "WorkerDebuggerAgent.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerRunLoop.h"
 #include "WorkerThread.h"
 #include <runtime/VM.h>
@@ -42,9 +42,9 @@
 
 namespace WebCore {
 
-WorkerScriptDebugServer::WorkerScriptDebugServer(WorkerContext* context, const String& mode)
+WorkerScriptDebugServer::WorkerScriptDebugServer(WorkerGlobalScope* context, const String& mode)
     : ScriptDebugServer()
-    , m_workerContext(context)
+    , m_workerGlobalScope(context)
     , m_debuggerTaskMode(mode)
 {
 }
@@ -55,7 +55,7 @@ void WorkerScriptDebugServer::addListener(ScriptDebugListener* listener)
         return;
 
     if (m_listeners.isEmpty())
-        m_workerContext->script()->attachDebugger(this);
+        m_workerGlobalScope->script()->attachDebugger(this);
     m_listeners.add(listener);
     recompileAllJSFunctions(0);
 }
@@ -68,7 +68,7 @@ void WorkerScriptDebugServer::willExecuteProgram(const JSC::DebuggerCallFrame& d
 
 void WorkerScriptDebugServer::recompileAllJSFunctions(Timer<ScriptDebugServer>*)
 {
-    JSC::VM* vm = m_workerContext->script()->vm();
+    JSC::VM* vm = m_workerGlobalScope->script()->vm();
 
     JSC::JSLockHolder lock(vm);
     // If JavaScript stack is not empty postpone recompilation.
@@ -85,14 +85,14 @@ void WorkerScriptDebugServer::removeListener(ScriptDebugListener* listener)
 
     m_listeners.remove(listener);
     if (m_listeners.isEmpty())
-        m_workerContext->script()->detachDebugger(this);
+        m_workerGlobalScope->script()->detachDebugger(this);
 }
 
 void WorkerScriptDebugServer::runEventLoopWhilePaused()
 {
     MessageQueueWaitResult result;
     do {
-        result = m_workerContext->thread()->runLoop().runInMode(m_workerContext, m_debuggerTaskMode);
+        result = m_workerGlobalScope->thread()->runLoop().runInMode(m_workerGlobalScope, m_debuggerTaskMode);
     // Keep waiting until execution is resumed.
     } while (result != MessageQueueTerminated && !m_doneProcessingDebuggerEvents);
 }
index 29e6517..e158180 100644 (file)
 
 namespace WebCore {
 
-class WorkerContext;
+class WorkerGlobalScope;
 
 class WorkerScriptDebugServer : public ScriptDebugServer {
     WTF_MAKE_NONCOPYABLE(WorkerScriptDebugServer);
 public:
-    WorkerScriptDebugServer(WorkerContext*, const String&);
+    WorkerScriptDebugServer(WorkerGlobalScope*, const String&);
     ~WorkerScriptDebugServer() { }
 
     void addListener(ScriptDebugListener*);
@@ -63,7 +63,7 @@ private:
 
     virtual void runEventLoopWhilePaused();
 
-    WorkerContext* m_workerContext;
+    WorkerGlobalScope* m_workerGlobalScope;
     ListenerSet m_listeners;
     String m_debuggerTaskMode;
 };
index 349b8d6..5738b22 100644 (file)
@@ -723,7 +723,7 @@ sub GenerateHeader
         $headerIncludes{"$interfaceName.h"} = 1;
     } else {
         # Implementation class forward declaration
-        if ($interfaceName eq "DOMWindow" || $interface->extendedAttributes->{"IsWorkerContext"}) {
+        if ($interfaceName eq "DOMWindow" || $interface->extendedAttributes->{"IsWorkerGlobalScope"}) {
             AddClassForwardIfNeeded($interfaceName) unless $svgPropertyOrListPropertyType;
         }
     }
@@ -745,7 +745,7 @@ sub GenerateHeader
         push(@headerContent, "        vm.heap.addFinalizer(ptr, destroy);\n");
         push(@headerContent, "        return ptr;\n");
         push(@headerContent, "    }\n\n");
-    } elsif ($interface->extendedAttributes->{"IsWorkerContext"}) {
+    } elsif ($interface->extendedAttributes->{"IsWorkerGlobalScope"}) {
         push(@headerContent, "    static $className* create(JSC::VM& vm, JSC::Structure* structure, PassRefPtr<$implType> impl)\n");
         push(@headerContent, "    {\n");
         push(@headerContent, "        $className* ptr = new (NotNull, JSC::allocateCell<$className>(vm.heap)) ${className}(vm, structure, impl);\n");
@@ -772,7 +772,7 @@ sub GenerateHeader
         push(@headerContent, "    }\n\n");
     }
 
-    if ($interfaceName eq "DOMWindow" || $interface->extendedAttributes->{"IsWorkerContext"}) {
+    if ($interfaceName eq "DOMWindow" || $interface->extendedAttributes->{"IsWorkerGlobalScope"}) {
         push(@headerContent, "    static const bool needsDestruction = false;\n\n");
     }
 
@@ -851,7 +851,7 @@ sub GenerateHeader
     }
     push(@headerContent, "    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)\n");
     push(@headerContent, "    {\n");
-    if ($interfaceName eq "DOMWindow" || $interface->extendedAttributes->{"IsWorkerContext"}) {
+    if ($interfaceName eq "DOMWindow" || $interface->extendedAttributes->{"IsWorkerGlobalScope"}) {
         push(@headerContent, "        return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::GlobalObjectType, StructureFlags), &s_info);\n");
     } else {
         push(@headerContent, "        return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), &s_info);\n");
@@ -995,7 +995,7 @@ sub GenerateHeader
     # Constructor
     if ($interfaceName eq "DOMWindow") {
         push(@headerContent, "    $className(JSC::VM&, JSC::Structure*, PassRefPtr<$implType>, JSDOMWindowShell*);\n");
-    } elsif ($interface->extendedAttributes->{"IsWorkerContext"}) {
+    } elsif ($interface->extendedAttributes->{"IsWorkerGlobalScope"}) {
         push(@headerContent, "    $className(JSC::VM&, JSC::Structure*, PassRefPtr<$implType>);\n");
     } else {
         push(@headerContent, "    $className(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<$implType>);\n");
@@ -1097,7 +1097,7 @@ sub GenerateHeader
     push(@headerContent, "class ${className}Prototype : public JSC::JSNonFinalObject {\n");
     push(@headerContent, "public:\n");
     push(@headerContent, "    typedef JSC::JSNonFinalObject Base;\n");
-    if ($interfaceName ne "DOMWindow" && !$interface->extendedAttributes->{"IsWorkerContext"}) {
+    if ($interfaceName ne "DOMWindow" && !$interface->extendedAttributes->{"IsWorkerGlobalScope"}) {
         push(@headerContent, "    static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*);\n");
     }
 
@@ -1781,7 +1781,7 @@ sub GenerateImplementation
     } else {
         push(@implContent, "const ClassInfo ${className}Prototype::s_info = { \"${visibleInterfaceName}Prototype\", &Base::s_info, &${className}PrototypeTable, 0, CREATE_METHOD_TABLE(${className}Prototype) };\n\n");
     }
-    if ($interfaceName ne "DOMWindow" && !$interface->extendedAttributes->{"IsWorkerContext"}) {
+    if ($interfaceName ne "DOMWindow" && !$interface->extendedAttributes->{"IsWorkerGlobalScope"}) {
         push(@implContent, "JSObject* ${className}Prototype::self(ExecState* exec, JSGlobalObject* globalObject)\n");
         push(@implContent, "{\n");
         push(@implContent, "    return getDOMPrototype<${className}>(exec, globalObject);\n");
@@ -1867,7 +1867,7 @@ sub GenerateImplementation
         push(@implContent, "    : $parentClassName(vm, structure, impl, shell)\n");
         push(@implContent, "{\n");
         push(@implContent, "}\n\n");
-    } elsif ($interface->extendedAttributes->{"IsWorkerContext"}) {
+    } elsif ($interface->extendedAttributes->{"IsWorkerGlobalScope"}) {
         AddIncludesForTypeInImpl($interfaceName);
         push(@implContent, "${className}::$className(VM& vm, Structure* structure, PassRefPtr<$implType> impl)\n");
         push(@implContent, "    : $parentClassName(vm, structure, impl)\n");
@@ -2070,7 +2070,7 @@ sub GenerateImplementation
                     push(@implContent, "    $interfaceName* impl = static_cast<$interfaceName*>(castedThis->impl());\n");
                     push(@implContent, "    if (EventListener* listener = impl->$implGetterFunctionName()) {\n");
                     push(@implContent, "        if (const JSEventListener* jsListener = JSEventListener::cast(listener)) {\n");
-                    if ($interfaceName eq "Document" || $interfaceName eq "WorkerContext" || $interfaceName eq "SharedWorkerContext" || $interfaceName eq "DedicatedWorkerContext") {
+                    if ($interfaceName eq "Document" || $interfaceName eq "WorkerGlobalScope" || $interfaceName eq "SharedWorkerGlobalScope" || $interfaceName eq "DedicatedWorkerGlobalScope") {
                         push(@implContent, "            if (JSObject* jsFunction = jsListener->jsFunction(impl))\n");
                     } else {
                         push(@implContent, "            if (JSObject* jsFunction = jsListener->jsFunction(impl->scriptExecutionContext()))\n");
@@ -2302,7 +2302,7 @@ sub GenerateImplementation
                                     push(@implContent, "    JSDOMGlobalObject* globalObject = castedThis->globalObject();\n");
                                 }
                                 push(@implContent, "    $interfaceName* impl = static_cast<$interfaceName*>(castedThis->impl());\n");
-                                if ((($interfaceName eq "DOMWindow") or ($interfaceName eq "WorkerContext")) and $name eq "onerror") {
+                                if ((($interfaceName eq "DOMWindow") or ($interfaceName eq "WorkerGlobalScope")) and $name eq "onerror") {
                                     $implIncludes{"JSErrorHandler.h"} = 1;
                                     push(@implContent, "    impl->set$implSetterFunctionName(createJSErrorHandler(exec, value, thisObject));\n");
                                 } else {
@@ -2521,7 +2521,7 @@ sub GenerateImplementation
                     push(@implContent, "    $className* castedThis = toJSDOMWindow(exec->hostThisValue().toThisObject(exec));\n");
                     push(@implContent, "    if (!castedThis)\n");
                     push(@implContent, "        return throwVMTypeError(exec);\n");
-                } elsif ($interface->extendedAttributes->{"IsWorkerContext"}) {
+                } elsif ($interface->extendedAttributes->{"IsWorkerGlobalScope"}) {
                     push(@implContent, "    $className* castedThis = to${className}(exec->hostThisValue().toThisObject(exec));\n");
                     push(@implContent, "    if (!castedThis)\n");
                     push(@implContent, "        return throwVMTypeError(exec);\n");
index 44c2f25..55e914e 100644 (file)
@@ -68,7 +68,7 @@ ImplementedAs=*
 InitializedByEventConstructor
 InterfaceName=*
 IsIndex
-IsWorkerContext
+IsWorkerGlobalScope
 JSCustomDefineOwnProperty
 JSCustomDefineOwnPropertyOnPrototype
 JSCustomFinalize
index db080c0..eabdd2b 100644 (file)
@@ -29,7 +29,7 @@ my $preprocessor;
 my $idlFilesList;
 my $supplementalDependencyFile;
 my $windowConstructorsFile;
-my $workerContextConstructorsFile;
+my $workerGlobalScopeConstructorsFile;
 my $supplementalMakefileDeps;
 
 GetOptions('defines=s' => \$defines,
@@ -37,13 +37,13 @@ GetOptions('defines=s' => \$defines,
            'idlFilesList=s' => \$idlFilesList,
            'supplementalDependencyFile=s' => \$supplementalDependencyFile,
            'windowConstructorsFile=s' => \$windowConstructorsFile,
-           'workerContextConstructorsFile=s' => \$workerContextConstructorsFile,
+           'workerGlobalScopeConstructorsFile=s' => \$workerGlobalScopeConstructorsFile,
            'supplementalMakefileDeps=s' => \$supplementalMakefileDeps);
 
 die('Must specify #define macros using --defines.') unless defined($defines);
 die('Must specify an output file using --supplementalDependencyFile.') unless defined($supplementalDependencyFile);
 die('Must specify an output file using --windowConstructorsFile.') unless defined($windowConstructorsFile);
-die('Must specify an output file using --workerContextConstructorsFile.') unless defined($workerContextConstructorsFile);
+die('Must specify an output file using --workerGlobalScopeConstructorsFile.') unless defined($workerGlobalScopeConstructorsFile);
 die('Must specify the file listing all IDLs using --idlFilesList.') unless defined($idlFilesList);
 
 open FH, "< $idlFilesList" or die "Cannot open $idlFilesList\n";
@@ -56,7 +56,7 @@ my %idlFileToInterfaceName;
 my %supplementalDependencies;
 my %supplementals;
 my $windowConstructorsCode = "";
-my $workerContextConstructorsCode = "";
+my $workerGlobalScopeConstructorsCode = "";
 
 # Get rid of duplicates in idlFiles array.
 my %idlFileHash = map { $_, 1 } @idlFiles;
@@ -98,7 +98,7 @@ foreach my $idlFile (sort keys %idlFileHash) {
             my $globalContext = $extendedAttributes->{"GlobalContext"} || "WindowOnly";
             my $attributeCode = GenerateConstructorAttribute($interfaceName, $extendedAttributes);
             $windowConstructorsCode .= $attributeCode unless $globalContext eq "WorkerOnly";
-            $workerContextConstructorsCode .= $attributeCode unless $globalContext eq "WindowOnly"
+            $workerGlobalScopeConstructorsCode .= $attributeCode unless $globalContext eq "WindowOnly"
         }
     }
     $supplementals{$fullPath} = [];
@@ -107,8 +107,8 @@ foreach my $idlFile (sort keys %idlFileHash) {
 # Generate DOMWindow Constructors partial interface.
 GeneratePartialInterface("DOMWindow", $windowConstructorsCode, $windowConstructorsFile);
 
-# Generate WorkerContext Constructors partial interface.
-GeneratePartialInterface("WorkerContext", $workerContextConstructorsCode, $workerContextConstructorsFile);
+# Generate WorkerGlobalScope Constructors partial interface.
+GeneratePartialInterface("WorkerGlobalScope", $workerGlobalScopeConstructorsCode, $workerGlobalScopeConstructorsFile);
 
 # Resolves partial interfaces and implements dependencies.
 foreach my $idlFile (keys %supplementalDependencies) {
index 646753e..0c6e8ed 100644 (file)
@@ -28,7 +28,7 @@
 #include "ActiveDOMObject.h"
 
 #include "ScriptExecutionContext.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include "WorkerThread.h"
 
 namespace WebCore {
index 6dd4d6e..95545ee 100644 (file)
@@ -43,7 +43,7 @@ namespace WebCore {
     class AudioNode;
     class AudioContext;
     class AudioTrackList;
-    class DedicatedWorkerContext;
+    class DedicatedWorkerGlobalScope;
     class DOMApplicationCache;
     class DOMWindow;
     class Event;
@@ -65,7 +65,7 @@ namespace WebCore {
     class SVGElementInstance;
     class ScriptExecutionContext;
     class SharedWorker;
-    class SharedWorkerContext;
+    class SharedWorkerGlobalScope;
     class SourceBufferList;
     class TextTrack;
     class TextTrackCue;
index 3895aee..aeea96a 100644 (file)
@@ -4,7 +4,7 @@ AudioNode conditional=WEB_AUDIO
 AudioContext conditional=WEB_AUDIO
 AudioTrackList conditional=VIDEO_TRACK
 BatteryManager conditional=BATTERY_STATUS
-DedicatedWorkerContext conditional=WORKERS
+DedicatedWorkerGlobalScope conditional=WORKERS
 DOMApplicationCache
 DOMWindow
 EventSource
@@ -30,7 +30,7 @@ RTCDataChannel conditional=MEDIA_STREAM
 RTCDTMFSender conditional=MEDIA_STREAM
 RTCPeerConnection conditional=MEDIA_STREAM
 SharedWorker conditional=SHARED_WORKERS
-SharedWorkerContext conditional=SHARED_WORKERS
+SharedWorkerGlobalScope conditional=SHARED_WORKERS
 SourceBufferList conditional=MEDIA_SOURCE
 SpeechRecognition conditional=SCRIPTED_SPEECH
 SpeechSynthesisUtterance conditional=SPEECH_SYNTHESIS
index 0edfa9f..74357be 100644 (file)
@@ -35,7 +35,7 @@
 #include "MessageEvent.h"
 #include "SecurityOrigin.h"
 #include "Timer.h"
-#include "WorkerContext.h"
+#include "WorkerGlobalScope.h"
 #include <wtf/text/AtomicString.h>
 
 namespace WebCore {
@@ -173,7 +173,7 @@ void Me