Initializes the context of WorkerScriptController before calling willEvaluateWorkerScript.

Source/bindings/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 95 matching lines @@
     // 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()
+bool WorkerScriptController::initializeContext()
 {
     v8::HandleScope handleScope(m_isolate);
 
     if (isContextInitialized())
         return true;
 
     v8::Handle<v8::Context> context = v8::Context::New(m_isolate);
     if (context.IsEmpty())
         return false;
 
@@ skipping 21 matching lines @@
 
     // 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();
+    ASSERT(isContextInitialized());

[haraken, 2014/05/09 10:03:22]

I think it's OK to call initializeContext from WorkerThread.cpp, but I don't
think it's OK to assume that context is initialized when evaluate() is called.

WorkerThread is not the only caller of evaluate(), so it's (probably
potentially) possible that other callers call evaluate() without initializing
context.

How about:

- Keep the name "initializeContextIfNeeded" as is.
- Keep WorkerScriptController::evaluate() as is.
- Call initializeContextIfNeeded() from WorkerThread.cpp.

?

[horo, 2014/05/09 10:22:00]

That sounds reasonable.
Done.

 
     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;
@@ skipping 87 matching lines @@
     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