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

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: removed untrue assert Created 6 years, 3 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
« no previous file with comments | « Source/bindings/core/v8/V8ScriptRunnerTest.cpp ('k') | Source/bindings/core/v8/v8.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 207
208 if (!m_disableEvalPending.isEmpty()) { 208 if (!m_disableEvalPending.isEmpty()) {
209 m_scriptState->context()->AllowCodeGenerationFromStrings(false); 209 m_scriptState->context()->AllowCodeGenerationFromStrings(false);
210 m_scriptState->context()->SetErrorMessageForCodeGenerationFromStrings(v8 String(m_isolate, m_disableEvalPending)); 210 m_scriptState->context()->SetErrorMessageForCodeGenerationFromStrings(v8 String(m_isolate, m_disableEvalPending));
211 m_disableEvalPending = String(); 211 m_disableEvalPending = String();
212 } 212 }
213 213
214 v8::TryCatch block; 214 v8::TryCatch block;
215 215
216 v8::Handle<v8::String> scriptString = v8String(m_isolate, script); 216 v8::Handle<v8::String> scriptString = v8String(m_isolate, script);
217 v8::Handle<v8::Script> compiledScript = V8ScriptRunner::compileScript(script String, fileName, scriptStartPosition, 0, m_isolate); 217 v8::Handle<v8::Script> compiledScript = V8ScriptRunner::compileScript(script String, fileName, scriptStartPosition, 0, 0, m_isolate);
218 v8::Local<v8::Value> result = V8ScriptRunner::runCompiledScript(compiledScri pt, &m_workerGlobalScope, m_isolate); 218 v8::Local<v8::Value> result = V8ScriptRunner::runCompiledScript(compiledScri pt, &m_workerGlobalScope, m_isolate);
219 219
220 if (!block.CanContinue()) { 220 if (!block.CanContinue()) {
221 m_workerGlobalScope.script()->forbidExecution(); 221 m_workerGlobalScope.script()->forbidExecution();
222 return ScriptValue(); 222 return ScriptValue();
223 } 223 }
224 224
225 if (block.HasCaught()) { 225 if (block.HasCaught()) {
226 v8::Local<v8::Message> message = block.Message(); 226 v8::Local<v8::Message> message = block.Message();
227 m_globalScopeExecutionState->hadException = true; 227 m_globalScopeExecutionState->hadException = true;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 311
312 void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBe RawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState) 312 void WorkerScriptController::rethrowExceptionFromImportedScript(PassRefPtrWillBe RawPtr<ErrorEvent> errorEvent, ExceptionState& exceptionState)
313 { 313 {
314 const String& errorMessage = errorEvent->message(); 314 const String& errorMessage = errorEvent->message();
315 if (m_globalScopeExecutionState) 315 if (m_globalScopeExecutionState)
316 m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent ; 316 m_globalScopeExecutionState->m_errorEventFromImportedScript = errorEvent ;
317 exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(error Message, m_isolate)); 317 exceptionState.rethrowV8Exception(V8ThrowException::createGeneralError(error Message, m_isolate));
318 } 318 }
319 319
320 } // namespace blink 320 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/V8ScriptRunnerTest.cpp ('k') | Source/bindings/core/v8/v8.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698