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

Side by Side Diff: Source/bindings/core/v8/WorkerScriptController.cpp

Issue 474683003: Not for review - Rebase of crrev.com/62833003 Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 6 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 23 matching lines...) Expand all
34 34
35 #include "bindings/core/v8/ScriptSourceCode.h" 35 #include "bindings/core/v8/ScriptSourceCode.h"
36 #include "bindings/core/v8/ScriptValue.h" 36 #include "bindings/core/v8/ScriptValue.h"
37 #include "bindings/core/v8/V8DedicatedWorkerGlobalScope.h" 37 #include "bindings/core/v8/V8DedicatedWorkerGlobalScope.h"
38 #include "bindings/core/v8/V8ErrorHandler.h" 38 #include "bindings/core/v8/V8ErrorHandler.h"
39 #include "bindings/core/v8/V8GCController.h" 39 #include "bindings/core/v8/V8GCController.h"
40 #include "bindings/core/v8/V8Initializer.h" 40 #include "bindings/core/v8/V8Initializer.h"
41 #include "bindings/core/v8/V8ObjectConstructor.h" 41 #include "bindings/core/v8/V8ObjectConstructor.h"
42 #include "bindings/core/v8/V8ScriptRunner.h" 42 #include "bindings/core/v8/V8ScriptRunner.h"
43 #include "bindings/core/v8/V8SharedWorkerGlobalScope.h" 43 #include "bindings/core/v8/V8SharedWorkerGlobalScope.h"
44 #include "bindings/core/v8/V8UIWorkerGlobalScope.h"
44 #include "bindings/core/v8/V8WorkerGlobalScope.h" 45 #include "bindings/core/v8/V8WorkerGlobalScope.h"
45 #include "bindings/core/v8/WrapperTypeInfo.h" 46 #include "bindings/core/v8/WrapperTypeInfo.h"
46 #include "core/events/ErrorEvent.h" 47 #include "core/events/ErrorEvent.h"
47 #include "core/frame/DOMTimer.h" 48 #include "core/frame/DOMTimer.h"
48 #include "core/inspector/ScriptCallStack.h" 49 #include "core/inspector/ScriptCallStack.h"
49 #include "core/workers/SharedWorkerGlobalScope.h" 50 #include "core/workers/SharedWorkerGlobalScope.h"
50 #include "core/workers/WorkerGlobalScope.h" 51 #include "core/workers/WorkerGlobalScope.h"
51 #include "core/workers/WorkerObjectProxy.h" 52 #include "core/workers/WorkerObjectProxy.h"
52 #include "core/workers/WorkerThread.h" 53 #include "core/workers/WorkerThread.h"
53 #include "platform/heap/ThreadState.h" 54 #include "platform/heap/ThreadState.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 308
308 void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBe RawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState) 309 void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBe RawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState)
309 { 310 {
310 const String& errorMessage = errorEvent->message(); 311 const String& errorMessage = errorEvent->message();
311 if (m_globalScopeExecutionState) 312 if (m_globalScopeExecutionState)
312 m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent ; 313 m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent ;
313 exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(error Message, m_isolate)); 314 exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(error Message, m_isolate));
314 } 315 }
315 316
316 } // namespace blink 317 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/generated.gypi ('k') | Source/bindings/core/v8/custom/V8UIWorkerGlobalScopeCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698