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

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

Issue 368283002: Stream scripts to V8 as they load - Blink side. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: renaming Created 6 years, 4 months 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 if (!m_disableEvalPending.isEmpty()) { 210 if (!m_disableEvalPending.isEmpty()) {
211 m_scriptState->context()->AllowCodeGenerationFromStrings(false); 211 m_scriptState->context()->AllowCodeGenerationFromStrings(false);
212 m_scriptState->context()->SetErrorMessageForCodeGenerationFromStrings(v8 String(m_isolate, m_disableEvalPending)); 212 m_scriptState->context()->SetErrorMessageForCodeGenerationFromStrings(v8 String(m_isolate, m_disableEvalPending));
213 m_disableEvalPending = String(); 213 m_disableEvalPending = String();
214 } 214 }
215 215
216 v8::TryCatch block; 216 v8::TryCatch block;
217 217
218 v8::Handle<v8::String> scriptString = v8String(m_isolate, script); 218 v8::Handle<v8::String> scriptString = v8String(m_isolate, script);
219 v8::Handle<v8::Script> compiledScript = V8ScriptRunner::compileScript(script String, fileName, scriptStartPosition, 0, m_isolate); 219 v8::Handle<v8::Script> compiledScript = V8ScriptRunner::compileScript(script String, fileName, scriptStartPosition, 0, 0, m_isolate);
220 v8::Local<v8::Value> result = V8ScriptRunner::runCompiledScript(compiledScri pt, &m_workerGlobalScope, m_isolate); 220 v8::Local<v8::Value> result = V8ScriptRunner::runCompiledScript(compiledScri pt, &m_workerGlobalScope, m_isolate);
221 221
222 if (!block.CanContinue()) { 222 if (!block.CanContinue()) {
223 m_workerGlobalScope.script()->forbidExecution(); 223 m_workerGlobalScope.script()->forbidExecution();
224 return ScriptValue(); 224 return ScriptValue();
225 } 225 }
226 226
227 if (block.HasCaught()) { 227 if (block.HasCaught()) {
228 v8::Local<v8::Message> message = block.Message(); 228 v8::Local<v8::Message> message = block.Message();
229 m_globalScopeExecutionState->hadException = true; 229 m_globalScopeExecutionState->hadException = true;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698