| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 #include "core/inspector/ScriptCallStack.h" | 49 #include "core/inspector/ScriptCallStack.h" |
| 50 #include "core/workers/SharedWorkerGlobalScope.h" | 50 #include "core/workers/SharedWorkerGlobalScope.h" |
| 51 #include "core/workers/WorkerGlobalScope.h" | 51 #include "core/workers/WorkerGlobalScope.h" |
| 52 #include "core/workers/WorkerObjectProxy.h" | 52 #include "core/workers/WorkerObjectProxy.h" |
| 53 #include "core/workers/WorkerThread.h" | 53 #include "core/workers/WorkerThread.h" |
| 54 #include "platform/heap/ThreadState.h" | 54 #include "platform/heap/ThreadState.h" |
| 55 #include "public/platform/Platform.h" | 55 #include "public/platform/Platform.h" |
| 56 #include "public/platform/WebWorkerRunLoop.h" | 56 #include "public/platform/WebWorkerRunLoop.h" |
| 57 #include <v8.h> | 57 #include <v8.h> |
| 58 | 58 |
| 59 namespace WebCore { | 59 namespace blink { |
| 60 | 60 |
| 61 class WorkerScriptController::WorkerGlobalScopeExecutionState FINAL { | 61 class WorkerScriptController::WorkerGlobalScopeExecutionState FINAL { |
| 62 STACK_ALLOCATED(); | 62 STACK_ALLOCATED(); |
| 63 public: | 63 public: |
| 64 explicit WorkerGlobalScopeExecutionState(WorkerScriptController* controller) | 64 explicit WorkerGlobalScopeExecutionState(WorkerScriptController* controller) |
| 65 : hadException(false) | 65 : hadException(false) |
| 66 , lineNumber(0) | 66 , lineNumber(0) |
| 67 , columnNumber(0) | 67 , columnNumber(0) |
| 68 , m_controller(controller) | 68 , m_controller(controller) |
| 69 , m_outerState(controller->m_globalScopeExecutionState) | 69 , m_outerState(controller->m_globalScopeExecutionState) |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 } | 312 } |
| 313 | 313 |
| 314 void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBe
RawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState) | 314 void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBe
RawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState) |
| 315 { | 315 { |
| 316 const String& errorMessage = errorEvent->message(); | 316 const String& errorMessage = errorEvent->message(); |
| 317 if (m_globalScopeExecutionState) | 317 if (m_globalScopeExecutionState) |
| 318 m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent
; | 318 m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent
; |
| 319 exceptionState.rethrowV8Exception(V8ThrowException::createError(v8GeneralErr
or, errorMessage, m_isolate)); | 319 exceptionState.rethrowV8Exception(V8ThrowException::createError(v8GeneralErr
or, errorMessage, m_isolate)); |
| 320 } | 320 } |
| 321 | 321 |
| 322 } // namespace WebCore | 322 } // namespace blink |
| OLD | NEW |