| 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 if (!m_disableEvalPending.isEmpty()) { | 204 if (!m_disableEvalPending.isEmpty()) { |
| 205 m_scriptState->context()->AllowCodeGenerationFromStrings(false); | 205 m_scriptState->context()->AllowCodeGenerationFromStrings(false); |
| 206 m_scriptState->context()->SetErrorMessageForCodeGenerationFromStrings(v8
String(m_isolate, m_disableEvalPending)); | 206 m_scriptState->context()->SetErrorMessageForCodeGenerationFromStrings(v8
String(m_isolate, m_disableEvalPending)); |
| 207 m_disableEvalPending = String(); | 207 m_disableEvalPending = String(); |
| 208 } | 208 } |
| 209 | 209 |
| 210 v8::TryCatch block; | 210 v8::TryCatch block; |
| 211 | 211 |
| 212 v8::Handle<v8::String> scriptString = v8String(m_isolate, script); | 212 v8::Handle<v8::String> scriptString = v8String(m_isolate, script); |
| 213 v8::Handle<v8::Script> compiledScript = V8ScriptRunner::compileScript(script
String, fileName, scriptStartPosition, 0, 0, m_isolate); | 213 v8::Handle<v8::Script> compiledScript = V8ScriptRunner::compileScript(script
String, fileName, scriptStartPosition, 0, 0, m_isolate); |
| 214 v8::Local<v8::Value> result = V8ScriptRunner::runCompiledScript(compiledScri
pt, &m_workerGlobalScope, m_isolate); | 214 v8::Local<v8::Value> result = V8ScriptRunner::runCompiledScript(m_isolate, c
ompiledScript, &m_workerGlobalScope); |
| 215 | 215 |
| 216 if (!block.CanContinue()) { | 216 if (!block.CanContinue()) { |
| 217 m_workerGlobalScope.script()->forbidExecution(); | 217 m_workerGlobalScope.script()->forbidExecution(); |
| 218 return ScriptValue(); | 218 return ScriptValue(); |
| 219 } | 219 } |
| 220 | 220 |
| 221 if (block.HasCaught()) { | 221 if (block.HasCaught()) { |
| 222 v8::Local<v8::Message> message = block.Message(); | 222 v8::Local<v8::Message> message = block.Message(); |
| 223 m_globalScopeExecutionState->hadException = true; | 223 m_globalScopeExecutionState->hadException = true; |
| 224 m_globalScopeExecutionState->errorMessage = toCoreString(message->Get())
; | 224 m_globalScopeExecutionState->errorMessage = toCoreString(message->Get())
; |
| (...skipping 82 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(error
Message, m_isolate)); | 313 exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(error
Message, m_isolate)); |
| 314 } | 314 } |
| 315 | 315 |
| 316 } // namespace blink | 316 } // namespace blink |
| OLD | NEW |