| Index: Source/bindings/v8/WorkerScriptController.cpp
|
| diff --git a/Source/bindings/v8/WorkerScriptController.cpp b/Source/bindings/v8/WorkerScriptController.cpp
|
| deleted file mode 100644
|
| index 8cf2eb2743f2cf19c46dd118267a9a777ac7d5da..0000000000000000000000000000000000000000
|
| --- a/Source/bindings/v8/WorkerScriptController.cpp
|
| +++ /dev/null
|
| @@ -1,267 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are
|
| - * met:
|
| - *
|
| - * * Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * * Redistributions in binary form must reproduce the above
|
| - * copyright notice, this list of conditions and the following disclaimer
|
| - * in the documentation and/or other materials provided with the
|
| - * distribution.
|
| - * * Neither the name of Google Inc. nor the names of its
|
| - * contributors may be used to endorse or promote products derived from
|
| - * this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -#include "config.h"
|
| -
|
| -#include "bindings/v8/WorkerScriptController.h"
|
| -
|
| -#include "bindings/core/v8/V8DedicatedWorkerGlobalScope.h"
|
| -#include "bindings/core/v8/V8SharedWorkerGlobalScope.h"
|
| -#include "bindings/core/v8/V8WorkerGlobalScope.h"
|
| -#include "bindings/modules/v8/V8ServiceWorkerGlobalScope.h"
|
| -#include "bindings/v8/ScriptSourceCode.h"
|
| -#include "bindings/v8/ScriptValue.h"
|
| -#include "bindings/v8/V8ErrorHandler.h"
|
| -#include "bindings/v8/V8GCController.h"
|
| -#include "bindings/v8/V8Initializer.h"
|
| -#include "bindings/v8/V8ObjectConstructor.h"
|
| -#include "bindings/v8/V8ScriptRunner.h"
|
| -#include "bindings/v8/WrapperTypeInfo.h"
|
| -#include "core/events/ErrorEvent.h"
|
| -#include "core/frame/DOMTimer.h"
|
| -#include "core/inspector/ScriptCallStack.h"
|
| -#include "core/workers/SharedWorkerGlobalScope.h"
|
| -#include "core/workers/WorkerGlobalScope.h"
|
| -#include "core/workers/WorkerObjectProxy.h"
|
| -#include "core/workers/WorkerThread.h"
|
| -#include "platform/heap/ThreadState.h"
|
| -#include <v8.h>
|
| -
|
| -#include "public/platform/Platform.h"
|
| -#include "public/platform/WebWorkerRunLoop.h"
|
| -
|
| -namespace WebCore {
|
| -
|
| -WorkerScriptController::WorkerScriptController(WorkerGlobalScope& workerGlobalScope)
|
| - : m_isolate(v8::Isolate::New())
|
| - , m_workerGlobalScope(workerGlobalScope)
|
| - , m_executionForbidden(false)
|
| - , m_executionScheduledToTerminate(false)
|
| -{
|
| - m_isolate->Enter();
|
| - V8Initializer::initializeWorker(m_isolate);
|
| - v8::V8::Initialize();
|
| - V8PerIsolateData::ensureInitialized(m_isolate);
|
| - m_world = DOMWrapperWorld::create(WorkerWorldId);
|
| - m_interruptor = adoptPtr(new V8IsolateInterruptor(m_isolate));
|
| - ThreadState::current()->addInterruptor(m_interruptor.get());
|
| -}
|
| -
|
| -// We need to postpone V8 Isolate destruction until the very end of
|
| -// worker thread finalization when all objects on the worker heap
|
| -// are destroyed.
|
| -class IsolateCleanupTask : public ThreadState::CleanupTask {
|
| -public:
|
| - static PassOwnPtr<IsolateCleanupTask> create(v8::Isolate* isolate)
|
| - {
|
| - return adoptPtr(new IsolateCleanupTask(isolate));
|
| - }
|
| -
|
| - virtual void postCleanup()
|
| - {
|
| - V8PerIsolateData::dispose(m_isolate);
|
| - m_isolate->Exit();
|
| - m_isolate->Dispose();
|
| - }
|
| -
|
| -private:
|
| - explicit IsolateCleanupTask(v8::Isolate* isolate) : m_isolate(isolate) { }
|
| -
|
| - v8::Isolate* m_isolate;
|
| -};
|
| -
|
| -WorkerScriptController::~WorkerScriptController()
|
| -{
|
| - ThreadState::current()->removeInterruptor(m_interruptor.get());
|
| -
|
| - m_world->dispose();
|
| -
|
| - // The corresponding call to didStartWorkerRunLoop is in
|
| - // WorkerThread::workerThread().
|
| - // See http://webkit.org/b/83104#c14 for why this is here.
|
| - blink::Platform::current()->didStopWorkerRunLoop(blink::WebWorkerRunLoop(&m_workerGlobalScope.thread()->runLoop()));
|
| -
|
| - if (isContextInitialized())
|
| - m_scriptState->disposePerContextData();
|
| -
|
| - ThreadState::current()->addCleanupTask(IsolateCleanupTask::create(m_isolate));
|
| -}
|
| -
|
| -bool WorkerScriptController::initializeContextIfNeeded()
|
| -{
|
| - v8::HandleScope handleScope(m_isolate);
|
| -
|
| - if (isContextInitialized())
|
| - return true;
|
| -
|
| - v8::Handle<v8::Context> context = v8::Context::New(m_isolate);
|
| - if (context.IsEmpty())
|
| - return false;
|
| -
|
| - m_scriptState = ScriptState::create(context, m_world);
|
| -
|
| - ScriptState::Scope scope(m_scriptState.get());
|
| -
|
| - // Set DebugId for the new context.
|
| - context->SetEmbedderData(0, v8AtomicString(m_isolate, "worker"));
|
| -
|
| - // Create a new JS object and use it as the prototype for the shadow global object.
|
| - const WrapperTypeInfo* contextType = &V8DedicatedWorkerGlobalScope::wrapperTypeInfo;
|
| - if (m_workerGlobalScope.isServiceWorkerGlobalScope())
|
| - contextType = &V8ServiceWorkerGlobalScope::wrapperTypeInfo;
|
| - else if (!m_workerGlobalScope.isDedicatedWorkerGlobalScope())
|
| - contextType = &V8SharedWorkerGlobalScope::wrapperTypeInfo;
|
| - v8::Handle<v8::Function> workerGlobalScopeConstructor = m_scriptState->perContextData()->constructorForType(contextType);
|
| - v8::Local<v8::Object> jsWorkerGlobalScope = V8ObjectConstructor::newInstance(m_isolate, workerGlobalScopeConstructor);
|
| - if (jsWorkerGlobalScope.IsEmpty()) {
|
| - m_scriptState->disposePerContextData();
|
| - return false;
|
| - }
|
| -
|
| - V8DOMWrapper::associateObjectWithWrapper<V8WorkerGlobalScope>(PassRefPtrWillBeRawPtr<WorkerGlobalScope>(&m_workerGlobalScope), contextType, jsWorkerGlobalScope, m_isolate, WrapperConfiguration::Dependent);
|
| -
|
| - // Insert the object instance as the prototype of the shadow object.
|
| - v8::Handle<v8::Object> globalObject = v8::Handle<v8::Object>::Cast(m_scriptState->context()->Global()->GetPrototype());
|
| - globalObject->SetPrototype(jsWorkerGlobalScope);
|
| -
|
| - return true;
|
| -}
|
| -
|
| -ScriptValue WorkerScriptController::evaluate(const String& script, const String& fileName, const TextPosition& scriptStartPosition, WorkerGlobalScopeExecutionState* state)
|
| -{
|
| - if (!initializeContextIfNeeded())
|
| - return ScriptValue();
|
| -
|
| - ScriptState::Scope scope(m_scriptState.get());
|
| -
|
| - if (!m_disableEvalPending.isEmpty()) {
|
| - m_scriptState->context()->AllowCodeGenerationFromStrings(false);
|
| - m_scriptState->context()->SetErrorMessageForCodeGenerationFromStrings(v8String(m_isolate, m_disableEvalPending));
|
| - m_disableEvalPending = String();
|
| - }
|
| -
|
| - v8::TryCatch block;
|
| -
|
| - v8::Handle<v8::String> scriptString = v8String(m_isolate, script);
|
| - v8::Handle<v8::Script> compiledScript = V8ScriptRunner::compileScript(scriptString, fileName, scriptStartPosition, 0, m_isolate);
|
| - v8::Local<v8::Value> result = V8ScriptRunner::runCompiledScript(compiledScript, &m_workerGlobalScope, m_isolate);
|
| -
|
| - if (!block.CanContinue()) {
|
| - m_workerGlobalScope.script()->forbidExecution();
|
| - return ScriptValue();
|
| - }
|
| -
|
| - if (block.HasCaught()) {
|
| - v8::Local<v8::Message> message = block.Message();
|
| - state->hadException = true;
|
| - state->errorMessage = toCoreString(message->Get());
|
| - state->lineNumber = message->GetLineNumber();
|
| - state->columnNumber = message->GetStartColumn() + 1;
|
| - TOSTRING_DEFAULT(V8StringResource<>, sourceURL, message->GetScriptOrigin().ResourceName(), ScriptValue());
|
| - state->sourceURL = sourceURL;
|
| - state->exception = ScriptValue(m_scriptState.get(), block.Exception());
|
| - block.Reset();
|
| - } else
|
| - state->hadException = false;
|
| -
|
| - if (result.IsEmpty() || result->IsUndefined())
|
| - return ScriptValue();
|
| -
|
| - return ScriptValue(m_scriptState.get(), result);
|
| -}
|
| -
|
| -void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, RefPtrWillBeRawPtr<ErrorEvent>* errorEvent)
|
| -{
|
| - if (isExecutionForbidden())
|
| - return;
|
| -
|
| - WorkerGlobalScopeExecutionState state;
|
| - evaluate(sourceCode.source(), sourceCode.url().string(), sourceCode.startPosition(), &state);
|
| - if (state.hadException) {
|
| - if (errorEvent) {
|
| - *errorEvent = m_workerGlobalScope.shouldSanitizeScriptError(state.sourceURL, NotSharableCrossOrigin) ?
|
| - ErrorEvent::createSanitizedError(m_world.get()) : ErrorEvent::create(state.errorMessage, state.sourceURL, state.lineNumber, state.columnNumber, m_world.get());
|
| - V8ErrorHandler::storeExceptionOnErrorEventWrapper(errorEvent->get(), state.exception.v8Value(), m_scriptState->context()->Global(), m_isolate);
|
| - } else {
|
| - ASSERT(!m_workerGlobalScope.shouldSanitizeScriptError(state.sourceURL, NotSharableCrossOrigin));
|
| - RefPtrWillBeRawPtr<ErrorEvent> event = nullptr;
|
| - if (m_errorEventFromImportedScript) {
|
| - event = m_errorEventFromImportedScript.release();
|
| - } else {
|
| - event = ErrorEvent::create(state.errorMessage, state.sourceURL, state.lineNumber, state.columnNumber, m_world.get());
|
| - }
|
| - m_workerGlobalScope.reportException(event, nullptr, NotSharableCrossOrigin);
|
| - }
|
| - }
|
| -}
|
| -
|
| -void WorkerScriptController::scheduleExecutionTermination()
|
| -{
|
| - // The mutex provides a memory barrier to ensure that once
|
| - // termination is scheduled, isExecutionTerminating will
|
| - // accurately reflect that state when called from another thread.
|
| - {
|
| - MutexLocker locker(m_scheduledTerminationMutex);
|
| - m_executionScheduledToTerminate = true;
|
| - }
|
| - v8::V8::TerminateExecution(m_isolate);
|
| -}
|
| -
|
| -bool WorkerScriptController::isExecutionTerminating() const
|
| -{
|
| - // See comments in scheduleExecutionTermination regarding mutex usage.
|
| - MutexLocker locker(m_scheduledTerminationMutex);
|
| - return m_executionScheduledToTerminate;
|
| -}
|
| -
|
| -void WorkerScriptController::forbidExecution()
|
| -{
|
| - ASSERT(m_workerGlobalScope.isContextThread());
|
| - m_executionForbidden = true;
|
| -}
|
| -
|
| -bool WorkerScriptController::isExecutionForbidden() const
|
| -{
|
| - ASSERT(m_workerGlobalScope.isContextThread());
|
| - return m_executionForbidden;
|
| -}
|
| -
|
| -void WorkerScriptController::disableEval(const String& errorMessage)
|
| -{
|
| - m_disableEvalPending = errorMessage;
|
| -}
|
| -
|
| -void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBeRawPtr<ErrorEvent> errorEvent)
|
| -{
|
| - m_errorEventFromImportedScript = errorEvent;
|
| - throwError(V8ThrowException::createError(v8GeneralError, m_errorEventFromImportedScript->message(), m_isolate), m_isolate);
|
| -}
|
| -
|
| -} // namespace WebCore
|
|
|