Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/WorkerScriptController.cpp

Issue 1535943005: Initial implementation of bindings and basic classes for worklets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove AbstractGlobalScope. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/bindings/core/v8/WorkerScriptController.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/WorkerScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/WorkerScriptController.cpp
index 24f0e63375363b04af39b0a748c91bbe594c833a..ae90ae386a93fcd48d97d3d61933a2097448a2fa 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WorkerScriptController.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/WorkerScriptController.cpp
@@ -30,147 +30,37 @@
#include "bindings/core/v8/WorkerScriptController.h"
-#include "bindings/core/v8/ScriptSourceCode.h"
-#include "bindings/core/v8/ScriptValue.h"
-#include "bindings/core/v8/V8DedicatedWorkerGlobalScope.h"
-#include "bindings/core/v8/V8ErrorHandler.h"
-#include "bindings/core/v8/V8Initializer.h"
-#include "bindings/core/v8/V8ObjectConstructor.h"
+#include "bindings/core/v8/V8DOMWrapper.h"
#include "bindings/core/v8/V8ScriptRunner.h"
-#include "bindings/core/v8/V8SharedWorkerGlobalScope.h"
#include "bindings/core/v8/V8WorkerGlobalScope.h"
#include "bindings/core/v8/WrapperTypeInfo.h"
#include "core/events/ErrorEvent.h"
-#include "core/frame/DOMTimer.h"
#include "core/inspector/ScriptCallStack.h"
-#include "core/inspector/WorkerThreadDebugger.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 "public/platform/Platform.h"
#include <v8.h>
namespace blink {
-class WorkerScriptController::WorkerGlobalScopeExecutionState final {
- STACK_ALLOCATED();
-public:
- explicit WorkerGlobalScopeExecutionState(WorkerScriptController* controller)
- : hadException(false)
- , lineNumber(0)
- , columnNumber(0)
- , m_controller(controller)
- , m_outerState(controller->m_globalScopeExecutionState)
- {
- m_controller->m_globalScopeExecutionState = this;
- }
-
- ~WorkerGlobalScopeExecutionState()
- {
- m_controller->m_globalScopeExecutionState = m_outerState;
- }
-
- DEFINE_INLINE_TRACE()
- {
- visitor->trace(m_errorEventFromImportedScript);
- visitor->trace(m_controller);
- }
-
- bool hadException;
- String errorMessage;
- int lineNumber;
- int columnNumber;
- String sourceURL;
- ScriptValue exception;
- RefPtrWillBeMember<ErrorEvent> m_errorEventFromImportedScript;
-
- // A WorkerGlobalScopeExecutionState context is stack allocated by
- // WorkerScriptController::evaluate(), with the contoller using it
- // during script evaluation. To handle nested evaluate() uses,
- // WorkerGlobalScopeExecutionStates are chained together;
- // |m_outerState| keeps a pointer to the context object one level out
- // (or 0, if outermost.) Upon return from evaluate(), the
- // WorkerScriptController's WorkerGlobalScopeExecutionState is popped
- // and the previous one restored (see above dtor.)
- //
- // With Oilpan, |m_outerState| isn't traced. It'll be "up the stack"
- // and its fields will be traced when scanning the stack.
- RawPtrWillBeMember<WorkerScriptController> m_controller;
- WorkerGlobalScopeExecutionState* m_outerState;
-};
-
PassOwnPtrWillBeRawPtr<WorkerScriptController> WorkerScriptController::create(WorkerGlobalScope* workerGlobalScope, v8::Isolate* isolate)
{
return adoptPtrWillBeNoop(new WorkerScriptController(workerGlobalScope, isolate));
}
WorkerScriptController::WorkerScriptController(WorkerGlobalScope* workerGlobalScope, v8::Isolate* isolate)
- : m_workerGlobalScope(workerGlobalScope)
- , m_executionForbidden(false)
- , m_executionScheduledToTerminate(false)
- , m_rejectedPromises(RejectedPromises::create())
- , m_globalScopeExecutionState(0)
+ : GlobalScopeScriptController(isolate)
+ , m_workerGlobalScope(workerGlobalScope)
{
- ASSERT(isolate);
- m_world = DOMWrapperWorld::create(isolate, WorkerWorldId);
}
WorkerScriptController::~WorkerScriptController()
{
- ASSERT(!m_rejectedPromises);
}
-void WorkerScriptController::dispose()
+void WorkerScriptController::didStopRunLoop()
{
- m_rejectedPromises->dispose();
- m_rejectedPromises.release();
-
- m_world->dispose();
-
- // The corresponding call to didStartRunLoop() is in WorkerThread::initialize().
- // See http://webkit.org/b/83104#c14 for why this is here.
m_workerGlobalScope->thread()->didStopRunLoop();
-
- if (isContextInitialized())
- m_scriptState->disposePerContextData();
-}
-
-bool WorkerScriptController::initializeContextIfNeeded()
-{
- v8::HandleScope handleScope(isolate());
-
- if (isContextInitialized())
- return true;
-
- v8::Local<v8::Context> context = v8::Context::New(isolate());
- if (context.IsEmpty())
- return false;
-
- m_scriptState = ScriptState::create(context, m_world);
-
- ScriptState::Scope scope(m_scriptState.get());
-
- // Name new context for debugging.
- WorkerThreadDebugger::setContextDebugData(context);
-
- // Create a new JS object and use it as the prototype for the shadow global object.
- const WrapperTypeInfo* wrapperTypeInfo = m_workerGlobalScope->wrapperTypeInfo();
- v8::Local<v8::Function> workerGlobalScopeConstructor = m_scriptState->perContextData()->constructorForType(wrapperTypeInfo);
- if (workerGlobalScopeConstructor.IsEmpty())
- return false;
- v8::Local<v8::Object> jsWorkerGlobalScope;
- if (!V8ObjectConstructor::newInstance(isolate(), workerGlobalScopeConstructor).ToLocal(&jsWorkerGlobalScope)) {
- m_scriptState->disposePerContextData();
- return false;
- }
-
- jsWorkerGlobalScope = V8DOMWrapper::associateObjectWithWrapper(isolate(), m_workerGlobalScope, wrapperTypeInfo, jsWorkerGlobalScope);
-
- // Insert the object instance as the prototype of the shadow object.
- v8::Local<v8::Object> globalObject = v8::Local<v8::Object>::Cast(m_scriptState->context()->Global()->GetPrototype());
- return v8CallBoolean(globalObject->SetPrototype(context, jsWorkerGlobalScope));
}
v8::Isolate* WorkerScriptController::isolate() const
@@ -178,138 +68,40 @@ v8::Isolate* WorkerScriptController::isolate() const
return m_workerGlobalScope->thread()->isolate();
}
-ScriptValue WorkerScriptController::evaluate(const String& script, const String& fileName, const TextPosition& scriptStartPosition, CachedMetadataHandler* cacheHandler, V8CacheOptions v8CacheOptions)
-{
- if (!initializeContextIfNeeded())
- return ScriptValue();
-
- ScriptState::Scope scope(m_scriptState.get());
-
- if (!m_disableEvalPending.isEmpty()) {
- m_scriptState->context()->AllowCodeGenerationFromStrings(false);
- m_scriptState->context()->SetErrorMessageForCodeGenerationFromStrings(v8String(isolate(), m_disableEvalPending));
- m_disableEvalPending = String();
- }
-
- v8::TryCatch block(isolate());
-
- v8::Local<v8::Script> compiledScript;
- v8::MaybeLocal<v8::Value> maybeResult;
- if (v8Call(V8ScriptRunner::compileScript(script, fileName, String(), scriptStartPosition, isolate(), cacheHandler, SharableCrossOrigin, v8CacheOptions), compiledScript, block))
- maybeResult = V8ScriptRunner::runCompiledScript(isolate(), compiledScript, m_workerGlobalScope);
-
- if (!block.CanContinue()) {
- forbidExecution();
- return ScriptValue();
- }
-
- if (block.HasCaught()) {
- v8::Local<v8::Message> message = block.Message();
- m_globalScopeExecutionState->hadException = true;
- m_globalScopeExecutionState->errorMessage = toCoreString(message->Get());
- if (v8Call(message->GetLineNumber(m_scriptState->context()), m_globalScopeExecutionState->lineNumber)
- && v8Call(message->GetStartColumn(m_scriptState->context()), m_globalScopeExecutionState->columnNumber)) {
- ++m_globalScopeExecutionState->columnNumber;
- } else {
- m_globalScopeExecutionState->lineNumber = 0;
- m_globalScopeExecutionState->columnNumber = 0;
- }
-
- TOSTRING_DEFAULT(V8StringResource<>, sourceURL, message->GetScriptOrigin().ResourceName(), ScriptValue());
- m_globalScopeExecutionState->sourceURL = sourceURL;
- m_globalScopeExecutionState->exception = ScriptValue(m_scriptState.get(), block.Exception());
- block.Reset();
- } else {
- m_globalScopeExecutionState->hadException = false;
- }
-
- v8::Local<v8::Value> result;
- if (!maybeResult.ToLocal(&result) || result->IsUndefined())
- return ScriptValue();
-
- return ScriptValue(m_scriptState.get(), result);
-}
-
-bool WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, RefPtrWillBeRawPtr<ErrorEvent>* errorEvent, CachedMetadataHandler* cacheHandler, V8CacheOptions v8CacheOptions)
-{
- if (isExecutionForbidden())
- return false;
-
- WorkerGlobalScopeExecutionState state(this);
- evaluate(sourceCode.source(), sourceCode.url().string(), sourceCode.startPosition(), cacheHandler, v8CacheOptions);
- if (isExecutionForbidden())
- return false;
- if (state.hadException) {
- if (errorEvent) {
- if (state.m_errorEventFromImportedScript) {
- // Propagate inner error event outwards.
- *errorEvent = state.m_errorEventFromImportedScript.release();
- return false;
- }
- if (m_workerGlobalScope->shouldSanitizeScriptError(state.sourceURL, NotSharableCrossOrigin))
- *errorEvent = ErrorEvent::createSanitizedError(m_world.get());
- else
- *errorEvent = ErrorEvent::create(state.errorMessage, state.sourceURL, state.lineNumber, state.columnNumber, m_world.get());
- V8ErrorHandler::storeExceptionOnErrorEventWrapper(m_scriptState.get(), errorEvent->get(), state.exception.v8Value(), m_scriptState->context()->Global());
- } else {
- ASSERT(!m_workerGlobalScope->shouldSanitizeScriptError(state.sourceURL, NotSharableCrossOrigin));
- RefPtrWillBeRawPtr<ErrorEvent> event = nullptr;
- if (state.m_errorEventFromImportedScript)
- event = state.m_errorEventFromImportedScript.release();
- else
- event = ErrorEvent::create(state.errorMessage, state.sourceURL, state.lineNumber, state.columnNumber, m_world.get());
- m_workerGlobalScope->reportException(event, 0, nullptr, NotSharableCrossOrigin);
- }
- return false;
- }
- return true;
-}
-
-void WorkerScriptController::willScheduleExecutionTermination()
+bool WorkerScriptController::isContextThread() const
{
- // 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;
+ return m_workerGlobalScope->isContextThread();
}
-bool WorkerScriptController::isExecutionTerminating() const
+const WrapperTypeInfo* WorkerScriptController::wrapperTypeInfoForGlobalScope() const
{
- // See comments in willScheduleExecutionTermination regarding mutex usage.
- MutexLocker locker(m_scheduledTerminationMutex);
- return m_executionScheduledToTerminate;
+ return m_workerGlobalScope->wrapperTypeInfo();
}
-void WorkerScriptController::forbidExecution()
+v8::Local<v8::Object> WorkerScriptController::associateGlobalScopeWithWrapper(const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper)
{
- ASSERT(m_workerGlobalScope->isContextThread());
- m_executionForbidden = true;
+ return V8DOMWrapper::associateObjectWithWrapper(isolate(), m_workerGlobalScope, wrapperTypeInfo, wrapper);
}
-bool WorkerScriptController::isExecutionForbidden() const
+v8::MaybeLocal<v8::Value> WorkerScriptController::runCompiledScript(v8::Local<v8::Script> compiledScript)
{
- ASSERT(m_workerGlobalScope->isContextThread());
- return m_executionForbidden;
+ return V8ScriptRunner::runCompiledScript(isolate(), compiledScript, m_workerGlobalScope);
}
-void WorkerScriptController::disableEval(const String& errorMessage)
+bool WorkerScriptController::shouldSanitizeScriptError(const String& sourceURL, AccessControlStatus corsStatus)
{
- m_disableEvalPending = errorMessage;
+ return m_workerGlobalScope->shouldSanitizeScriptError(sourceURL, corsStatus);
}
-void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBeRawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState)
+void WorkerScriptController::reportException(PassRefPtrWillBeRawPtr<ErrorEvent> event, int scriptId, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, AccessControlStatus corsStatus)
{
- const String& errorMessage = errorEvent->message();
- if (m_globalScopeExecutionState)
- m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent;
- exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(isolate(), errorMessage));
+ return m_workerGlobalScope->reportException(event, scriptId, callStack, corsStatus);
}
DEFINE_TRACE(WorkerScriptController)
{
visitor->trace(m_workerGlobalScope);
- visitor->trace(m_rejectedPromises);
+ GlobalScopeScriptController::trace(visitor);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698