Rename WorkerGlobalScopeExecutionState to ExecutionState.

third_party/WebKit/Source/bindings/core/v8/WorkerScriptController.cpp

 /*
  * 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
@@ skipping 36 matching lines @@
 #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 {
+class WorkerScriptController::ExecutionState final {
     STACK_ALLOCATED();
 public:
-    explicit WorkerGlobalScopeExecutionState(WorkerScriptController* controller)
+    explicit ExecutionState(WorkerScriptController* controller)
         : hadException(false)
         , lineNumber(0)
         , columnNumber(0)
         , m_controller(controller)
-        , m_outerState(controller->m_globalScopeExecutionState)
+        , m_outerState(controller->m_executionState)
     {
-        m_controller->m_globalScopeExecutionState = this;
+        m_controller->m_executionState = this;
     }
 
-    ~WorkerGlobalScopeExecutionState()
+    ~ExecutionState()
     {
-        m_controller->m_globalScopeExecutionState = m_outerState;
+        m_controller->m_executionState = 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
+    // A ExecutionState context is stack allocated by
     // WorkerScriptController::evaluate(), with the contoller using it
     // during script evaluation. To handle nested evaluate() uses,
-    // WorkerGlobalScopeExecutionStates are chained together;
+    // ExecutionStates 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.)
+    // WorkerScriptController's ExecutionState 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;
+    ExecutionState* 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)
+    , m_executionState(0)
 {
     ASSERT(isolate);
     m_world = DOMWrapperWorld::create(isolate, WorkerWorldId);
 }
 
 WorkerScriptController::~WorkerScriptController()
 {
     ASSERT(!m_rejectedPromises);
 }
 
@@ skipping 73 matching lines @@
     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;
+        m_executionState->hadException = true;
+        m_executionState->errorMessage = toCoreString(message->Get());
+        if (v8Call(message->GetLineNumber(m_scriptState->context()), m_executionState->lineNumber)
+            && v8Call(message->GetStartColumn(m_scriptState->context()), m_executionState->columnNumber)) {
+            ++m_executionState->columnNumber;
         } else {
-            m_globalScopeExecutionState->lineNumber = 0;
-            m_globalScopeExecutionState->columnNumber = 0;
+            m_executionState->lineNumber = 0;
+            m_executionState->columnNumber = 0;
         }
 
         TOSTRING_DEFAULT(V8StringResource<>, sourceURL, message->GetScriptOrigin().ResourceName(), ScriptValue());
-        m_globalScopeExecutionState->sourceURL = sourceURL;
-        m_globalScopeExecutionState->exception = ScriptValue(m_scriptState.get(), block.Exception());
+        m_executionState->sourceURL = sourceURL;
+        m_executionState->exception = ScriptValue(m_scriptState.get(), block.Exception());
         block.Reset();
     } else {
-        m_globalScopeExecutionState->hadException = false;
+        m_executionState->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);
+    ExecutionState 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;
             }
@@ skipping 45 matching lines @@
 }
 
 void WorkerScriptController::disableEval(const String& errorMessage)
 {
     m_disableEvalPending = errorMessage;
 }
 
 void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBeRawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState)
 {
     const String& errorMessage = errorEvent->message();
-    if (m_globalScopeExecutionState)
-        m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent;
+    if (m_executionState)
+        m_executionState->m_errorEventFromImportedScript = errorEvent;
     exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(isolate(), errorMessage));
 }
 
 DEFINE_TRACE(WorkerScriptController)
 {
     visitor->trace(m_workerGlobalScope);
     visitor->trace(m_rejectedPromises);
 }
 
 } // namespace blink