| Index: Source/bindings/core/v8/WorkerScriptController.cpp
|
| diff --git a/Source/bindings/v8/WorkerScriptController.cpp b/Source/bindings/core/v8/WorkerScriptController.cpp
|
| similarity index 95%
|
| rename from Source/bindings/v8/WorkerScriptController.cpp
|
| rename to Source/bindings/core/v8/WorkerScriptController.cpp
|
| index 8cf2eb2743f2cf19c46dd118267a9a777ac7d5da..d7e3a93b43fd4276e6d5dec0044caf869bb75833 100644
|
| --- a/Source/bindings/v8/WorkerScriptController.cpp
|
| +++ b/Source/bindings/core/v8/WorkerScriptController.cpp
|
| @@ -30,20 +30,20 @@
|
|
|
| #include "config.h"
|
|
|
| -#include "bindings/v8/WorkerScriptController.h"
|
| +#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/V8GCController.h"
|
| +#include "bindings/core/v8/V8Initializer.h"
|
| +#include "bindings/core/v8/V8ObjectConstructor.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 "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"
|
| @@ -52,10 +52,9 @@
|
| #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"
|
| +#include <v8.h>
|
|
|
| namespace WebCore {
|
|
|
| @@ -188,8 +187,9 @@ ScriptValue WorkerScriptController::evaluate(const String& script, const String&
|
| state->sourceURL = sourceURL;
|
| state->exception = ScriptValue(m_scriptState.get(), block.Exception());
|
| block.Reset();
|
| - } else
|
| + } else {
|
| state->hadException = false;
|
| + }
|
|
|
| if (result.IsEmpty() || result->IsUndefined())
|
| return ScriptValue();
|
|
|