| 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 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 #include "sky/engine/config.h" | 31 #include "sky/engine/config.h" |
| 32 #include "sky/engine/v8_inspector/ScriptPreprocessor.h" | 32 #include "sky/engine/v8_inspector/ScriptPreprocessor.h" |
| 33 | 33 |
| 34 #include "sky/engine/bindings/core/v8/ScriptController.h" | 34 #include "sky/engine/bindings/core/v8/ScriptController.h" |
| 35 #include "sky/engine/bindings/core/v8/ScriptSourceCode.h" | 35 #include "sky/engine/bindings/core/v8/ScriptSourceCode.h" |
| 36 #include "sky/engine/bindings/core/v8/ScriptValue.h" | 36 #include "sky/engine/bindings/core/v8/ScriptValue.h" |
| 37 #include "sky/engine/bindings/core/v8/V8Binding.h" | 37 #include "sky/engine/bindings/core/v8/V8Binding.h" |
| 38 #include "sky/engine/bindings/core/v8/V8ScriptRunner.h" | 38 #include "sky/engine/bindings/core/v8/V8ScriptRunner.h" |
| 39 #include "sky/engine/core/frame/FrameConsole.h" | 39 #include "sky/engine/core/frame/FrameConsole.h" |
| 40 #include "sky/engine/core/frame/FrameHost.h" | |
| 41 #include "sky/engine/core/frame/LocalFrame.h" | 40 #include "sky/engine/core/frame/LocalFrame.h" |
| 42 #include "sky/engine/core/inspector/ConsoleMessage.h" | 41 #include "sky/engine/core/inspector/ConsoleMessage.h" |
| 43 #include "sky/engine/wtf/TemporaryChange.h" | 42 #include "sky/engine/wtf/TemporaryChange.h" |
| 44 | 43 |
| 45 namespace blink { | 44 namespace blink { |
| 46 | 45 |
| 47 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc
eCode, LocalFrame* frame) | 46 ScriptPreprocessor::ScriptPreprocessor(const ScriptSourceCode& preprocessorSourc
eCode, LocalFrame* frame) |
| 48 : m_isPreprocessing(false) | 47 : m_isPreprocessing(false) |
| 49 { | 48 { |
| 50 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptP
reprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup); | 49 RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(ScriptP
reprocessorIsolatedWorldId, DOMWrapperWorld::mainWorldExtensionGroup); |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true); | 105 TemporaryChange<bool> isPreprocessing(m_isPreprocessing, true); |
| 107 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); |
| 108 | 107 |
| 109 if (!resultValue.IsEmpty() && resultValue->IsString()) | 108 if (!resultValue.IsEmpty() && resultValue->IsString()) |
| 110 return toCoreStringWithNullCheck(resultValue.As<v8::String>()); | 109 return toCoreStringWithNullCheck(resultValue.As<v8::String>()); |
| 111 | 110 |
| 112 return sourceCode; | 111 return sourceCode; |
| 113 } | 112 } |
| 114 | 113 |
| 115 } // namespace blink | 114 } // namespace blink |
| OLD | NEW |