OLD | NEW |
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 Loading... |
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()); |
52 ASSERT(frame); | 53 ASSERT(frame); |
53 v8::TryCatch tryCatch; | 54 v8::TryCatch tryCatch; |
54 tryCatch.SetVerbose(true); | 55 tryCatch.SetVerbose(true); |
55 Vector<ScriptSourceCode> sources; | 56 Vector<ScriptSourceCode> sources; |
56 sources.append(preprocessorSourceCode); | 57 sources.append(preprocessorSourceCode); |
57 Vector<ScriptValue> scriptResults; | 58 Vector<v8::Local<v8::Value> > scriptResults; |
58 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld
Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults); | 59 frame->script().executeScriptInIsolatedWorld(ScriptPreprocessorIsolatedWorld
Id, sources, DOMWrapperWorld::mainWorldExtensionGroup, &scriptResults); |
59 | 60 |
60 if (scriptResults.size() != 1) { | 61 if (scriptResults.size() != 1) { |
61 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "ScriptP
reprocessor internal error, one ScriptSourceCode must give exactly one result.")
; | 62 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "ScriptP
reprocessor internal error, one ScriptSourceCode must give exactly one result.")
; |
62 return; | 63 return; |
63 } | 64 } |
64 | 65 |
65 ScriptValue preprocessorFunction = scriptResults[0]; | 66 v8::Local<v8::Value> preprocessorFunction = scriptResults[0]; |
66 if (!preprocessorFunction.isFunction()) { | 67 if (preprocessorFunction.IsEmpty() || !preprocessorFunction->IsFunction()) { |
67 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "The pre
processor must compile to a function."); | 68 frame->console().addMessage(JSMessageSource, ErrorMessageLevel, "The pre
processor must compile to a function."); |
68 return; | 69 return; |
69 } | 70 } |
70 m_preprocessorFunction.set(m_scriptState->isolate(), v8::Handle<v8::Function
>::Cast(preprocessorFunction.v8Value())); | 71 m_preprocessorFunction.set(m_scriptState->isolate(), v8::Handle<v8::Function
>::Cast(preprocessorFunction)); |
71 } | 72 } |
72 | 73 |
73 String ScriptPreprocessor::preprocessSourceCode(const String& sourceCode, const
String& sourceName) | 74 String ScriptPreprocessor::preprocessSourceCode(const String& sourceCode, const
String& sourceName) |
74 { | 75 { |
75 if (!isValid()) | 76 if (!isValid()) |
76 return sourceCode; | 77 return sourceCode; |
77 | 78 |
78 return preprocessSourceCode(sourceCode, sourceName, v8::Undefined(m_scriptSt
ate->isolate())); | 79 return preprocessSourceCode(sourceCode, sourceName, v8::Undefined(m_scriptSt
ate->isolate())); |
79 } | 80 } |
80 | 81 |
(...skipping 23 matching lines...) Expand all Loading... |
104 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true); | 105 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true); |
105 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate,
m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT
F_ARRAY_LENGTH(argv), argv); | 106 v8::Handle<v8::Value> resultValue = V8ScriptRunner::callAsFunction(isolate,
m_preprocessorFunction.newLocal(isolate), m_scriptState->context()->Global(), WT
F_ARRAY_LENGTH(argv), argv); |
106 | 107 |
107 if (!resultValue.IsEmpty() && resultValue->IsString()) | 108 if (!resultValue.IsEmpty() && resultValue->IsString()) |
108 return toCoreStringWithNullCheck(resultValue.As<v8::String>()); | 109 return toCoreStringWithNullCheck(resultValue.As<v8::String>()); |
109 | 110 |
110 return sourceCode; | 111 return sourceCode; |
111 } | 112 } |
112 | 113 |
113 } // namespace WebCore | 114 } // namespace WebCore |
OLD | NEW |