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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 // are destroyed. | 125 // are destroyed. |
126 class IsolateCleanupTask : public ThreadState::CleanupTask { | 126 class IsolateCleanupTask : public ThreadState::CleanupTask { |
127 public: | 127 public: |
128 static PassOwnPtr<IsolateCleanupTask> create(v8::Isolate* isolate) | 128 static PassOwnPtr<IsolateCleanupTask> create(v8::Isolate* isolate) |
129 { | 129 { |
130 return adoptPtr(new IsolateCleanupTask(isolate)); | 130 return adoptPtr(new IsolateCleanupTask(isolate)); |
131 } | 131 } |
132 | 132 |
133 virtual void postCleanup() | 133 virtual void postCleanup() |
134 { | 134 { |
135 V8PerIsolateData::dispose(m_isolate); | 135 V8PerIsolateData::destroy(m_isolate); |
136 m_isolate->Exit(); | 136 m_isolate->Exit(); |
137 m_isolate->Dispose(); | 137 m_isolate->Dispose(); |
138 } | 138 } |
139 | 139 |
140 private: | 140 private: |
141 explicit IsolateCleanupTask(v8::Isolate* isolate) : m_isolate(isolate) { } | 141 explicit IsolateCleanupTask(v8::Isolate* isolate) : m_isolate(isolate) { } |
142 | 142 |
143 v8::Isolate* m_isolate; | 143 v8::Isolate* m_isolate; |
144 }; | 144 }; |
145 | 145 |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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::createGeneralError(error
Message, m_isolate)); | 319 exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(error
Message, m_isolate)); |
320 } | 320 } |
321 | 321 |
322 } // namespace blink | 322 } // namespace blink |
OLD | NEW |