| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 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 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/inspector/InjectedScriptModule.h" | 32 #include "core/inspector/InjectedScriptModule.h" |
| 33 | 33 |
| 34 #include "bindings/v8/ScriptFunctionCall.h" | 34 #include "bindings/v8/ScriptFunctionCall.h" |
| 35 #include "bindings/v8/ScriptObject.h" | 35 #include "bindings/v8/ScriptValue.h" |
| 36 #include "core/inspector/InjectedScript.h" | 36 #include "core/inspector/InjectedScript.h" |
| 37 #include "core/inspector/InjectedScriptManager.h" | 37 #include "core/inspector/InjectedScriptManager.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 InjectedScriptModule::InjectedScriptModule(const String& name) | 41 InjectedScriptModule::InjectedScriptModule(const String& name) |
| 42 : InjectedScriptBase(name) | 42 : InjectedScriptBase(name) |
| 43 { | 43 { |
| 44 } | 44 } |
| 45 | 45 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 61 ScriptFunctionCall function(injectedScript.injectedScriptObject(), "inje
ctModule"); | 61 ScriptFunctionCall function(injectedScript.injectedScriptObject(), "inje
ctModule"); |
| 62 function.appendArgument(name()); | 62 function.appendArgument(name()); |
| 63 function.appendArgument(source()); | 63 function.appendArgument(source()); |
| 64 resultValue = injectedScript.callFunctionWithEvalEnabled(function, hadEx
ception); | 64 resultValue = injectedScript.callFunctionWithEvalEnabled(function, hadEx
ception); |
| 65 if (hadException || resultValue.isEmpty() || !resultValue.isObject()) { | 65 if (hadException || resultValue.isEmpty() || !resultValue.isObject()) { |
| 66 ASSERT_NOT_REACHED(); | 66 ASSERT_NOT_REACHED(); |
| 67 return; | 67 return; |
| 68 } | 68 } |
| 69 } | 69 } |
| 70 | 70 |
| 71 ScriptObject moduleObject(scriptState, resultValue); | 71 initialize(resultValue, injectedScriptManager->inspectedStateAccessCheck()); |
| 72 initialize(moduleObject, injectedScriptManager->inspectedStateAccessCheck())
; | |
| 73 } | 72 } |
| 74 | 73 |
| 75 } // namespace WebCore | 74 } // namespace WebCore |
| OLD | NEW |