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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 if (errorEvent) { | 249 if (errorEvent) { |
250 if (state.m_errorEventFromImportedScript) { | 250 if (state.m_errorEventFromImportedScript) { |
251 // Propagate inner error event outwards. | 251 // Propagate inner error event outwards. |
252 *errorEvent = state.m_errorEventFromImportedScript.release(); | 252 *errorEvent = state.m_errorEventFromImportedScript.release(); |
253 return; | 253 return; |
254 } | 254 } |
255 if (m_workerGlobalScope.shouldSanitizeScriptError(state.sourceURL, N
otSharableCrossOrigin)) | 255 if (m_workerGlobalScope.shouldSanitizeScriptError(state.sourceURL, N
otSharableCrossOrigin)) |
256 *errorEvent = ErrorEvent::createSanitizedError(m_world.get()); | 256 *errorEvent = ErrorEvent::createSanitizedError(m_world.get()); |
257 else | 257 else |
258 *errorEvent = ErrorEvent::create(state.errorMessage, state.sourc
eURL, state.lineNumber, state.columnNumber, m_world.get()); | 258 *errorEvent = ErrorEvent::create(state.errorMessage, state.sourc
eURL, state.lineNumber, state.columnNumber, m_world.get()); |
259 V8ErrorHandler::storeExceptionOnErrorEventWrapper(errorEvent->get(),
state.exception.v8Value(), m_scriptState->context()->Global(), m_isolate); | 259 V8ErrorHandler::storeExceptionOnErrorEventWrapper(m_isolate, errorEv
ent->get(), state.exception.v8Value(), m_scriptState->context()->Global()); |
260 } else { | 260 } else { |
261 ASSERT(!m_workerGlobalScope.shouldSanitizeScriptError(state.sourceUR
L, NotSharableCrossOrigin)); | 261 ASSERT(!m_workerGlobalScope.shouldSanitizeScriptError(state.sourceUR
L, NotSharableCrossOrigin)); |
262 RefPtrWillBeRawPtr<ErrorEvent> event = nullptr; | 262 RefPtrWillBeRawPtr<ErrorEvent> event = nullptr; |
263 if (state.m_errorEventFromImportedScript) | 263 if (state.m_errorEventFromImportedScript) |
264 event = state.m_errorEventFromImportedScript.release(); | 264 event = state.m_errorEventFromImportedScript.release(); |
265 else | 265 else |
266 event = ErrorEvent::create(state.errorMessage, state.sourceURL,
state.lineNumber, state.columnNumber, m_world.get()); | 266 event = ErrorEvent::create(state.errorMessage, state.sourceURL,
state.lineNumber, state.columnNumber, m_world.get()); |
267 m_workerGlobalScope.reportException(event, 0, nullptr, NotSharableCr
ossOrigin); | 267 m_workerGlobalScope.reportException(event, 0, nullptr, NotSharableCr
ossOrigin); |
268 } | 268 } |
269 } | 269 } |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 | 307 |
308 void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBe
RawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState) | 308 void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBe
RawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState) |
309 { | 309 { |
310 const String& errorMessage = errorEvent->message(); | 310 const String& errorMessage = errorEvent->message(); |
311 if (m_globalScopeExecutionState) | 311 if (m_globalScopeExecutionState) |
312 m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent
; | 312 m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent
; |
313 exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(m_iso
late, errorMessage)); | 313 exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(m_iso
late, errorMessage)); |
314 } | 314 } |
315 | 315 |
316 } // namespace blink | 316 } // namespace blink |
OLD | NEW |