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

Side by Side Diff: Source/bindings/v8/ScriptPreprocessor.cpp

Issue 326853002: Revert of Add an ASSERT about cross-world wrapper leakage into ScriptValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/v8/ScriptController.cpp ('k') | Source/bindings/v8/ScriptPromise.h » ('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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "wtf/TemporaryChange.h" 42 #include "wtf/TemporaryChange.h"
43 43
44 namespace WebCore { 44 namespace WebCore {
45 45
46 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc eCode, LocalFrame* frame) 46 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc eCode, LocalFrame* frame)
47 : m_isPreprocessing(false) 47 : m_isPreprocessing(false)
48 { 48 {
49 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptP reprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup); 49 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptP reprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup);
50 m_scriptState = ScriptState::from(toV8Context(frame, *world)); 50 m_scriptState = ScriptState::from(toV8Context(frame, *world));
51 51
52 v8::HandleScope handleScope(m_scriptState->isolate());
53 ASSERT(frame); 52 ASSERT(frame);
54 v8::TryCatch tryCatch; 53 v8::TryCatch tryCatch;
55 tryCatch.SetVerbose(true); 54 tryCatch.SetVerbose(true);
56 Vector<ScriptSourceCode> sources; 55 Vector<ScriptSourceCode> sources;
57 sources.append(preprocessorSourceCode); 56 sources.append(preprocessorSourceCode);
58 Vector<v8::Local<v8::Value> > scriptResults; 57 Vector<ScriptValue> scriptResults;
59 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults); 58 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults);
60 59
61 if (scriptResults.size() != 1) { 60 if (scriptResults.size() != 1) {
62 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "ScriptP reprocessor internal error, one ScriptSourceCode must give exactly one result.") ; 61 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "ScriptP reprocessor internal error, one ScriptSourceCode must give exactly one result.") ;
63 return; 62 return;
64 } 63 }
65 64
66 v8::Local<v8::Value> preprocessorFunction = scriptResults[0]; 65 ScriptValue preprocessorFunction = scriptResults[0];
67 if (preprocessorFunction.IsEmpty() || !preprocessorFunction->IsFunction()) { 66 if (!preprocessorFunction.isFunction()) {
68 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "The pre processor must compile to a function."); 67 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "The pre processor must compile to a function.");
69 return; 68 return;
70 } 69 }
71 m_preprocessorFunction.set(m_scriptState->isolate(), v8::Handle<v8::Function >::Cast(preprocessorFunction)); 70 m_preprocessorFunction.set(m_scriptState->isolate(), v8::Handle<v8::Function >::Cast(preprocessorFunction.v8Value()));
72 } 71 }
73 72
74 String ScriptPreprocessor::preprocessSourceCode(const String& sourceCode, const String& sourceName) 73 String ScriptPreprocessor::preprocessSourceCode(const String& sourceCode, const String& sourceName)
75 { 74 {
76 if (!isValid()) 75 if (!isValid())
77 return sourceCode; 76 return sourceCode;
78 77
79 return preprocessSourceCode(sourceCode, sourceName, v8::Undefined(m_scriptSt ate->isolate())); 78 return preprocessSourceCode(sourceCode, sourceName, v8::Undefined(m_scriptSt ate->isolate()));
80 } 79 }
81 80
(...skipping 23 matching lines...) Expand all
105 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true); 104 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true);
106 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate, m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT F_ARRAY_LENGTH(argv), argv); 105 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate, m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT F_ARRAY_LENGTH(argv), argv);
107 106
108 if (!resultValue.IsEmpty() && resultValue->IsString()) 107 if (!resultValue.IsEmpty() && resultValue->IsString())
109 return toCoreStringWithNullCheck(resultValue.As<v8::String>()); 108 return toCoreStringWithNullCheck(resultValue.As<v8::String>());
110 109
111 return sourceCode; 110 return sourceCode;
112 } 111 }
113 112
114 } // namespace WebCore 113 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/ScriptController.cpp ('k') | Source/bindings/v8/ScriptPromise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698