| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> | 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> |
| 4 * Copyright (C) 2012 Google Inc. All rights reserved. | 4 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 22 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
| 23 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 23 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 24 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 24 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "sky/engine/config.h" | 31 #include "sky/engine/config.h" |
| 32 #include "sky/engine/core/inspector/InjectedScriptManager.h" | 32 #include "sky/engine/v8_inspector/InjectedScriptManager.h" |
| 33 | 33 |
| 34 #include "sky/engine/bindings/core/v8/ScriptValue.h" | 34 #include "sky/engine/bindings/core/v8/ScriptValue.h" |
| 35 #include "sky/engine/core/inspector/InjectedScript.h" | |
| 36 #include "sky/engine/core/inspector/InjectedScriptHost.h" | 35 #include "sky/engine/core/inspector/InjectedScriptHost.h" |
| 37 #include "sky/engine/core/inspector/JSONParser.h" | |
| 38 #include "sky/engine/platform/JSONValues.h" | 36 #include "sky/engine/platform/JSONValues.h" |
| 39 #include "sky/engine/public/platform/Platform.h" | 37 #include "sky/engine/public/platform/Platform.h" |
| 40 #include "sky/engine/public/platform/WebData.h" | 38 #include "sky/engine/public/platform/WebData.h" |
| 39 #include "sky/engine/v8_inspector/InjectedScript.h" |
| 40 #include "sky/engine/v8_inspector/JSONParser.h" |
| 41 #include "sky/engine/wtf/PassOwnPtr.h" | 41 #include "sky/engine/wtf/PassOwnPtr.h" |
| 42 | 42 |
| 43 namespace blink { | 43 namespace blink { |
| 44 | 44 |
| 45 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage() | 45 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage() |
| 46 { | 46 { |
| 47 return adoptPtr(new InjectedScriptManager); | 47 return adoptPtr(new InjectedScriptManager); |
| 48 } | 48 } |
| 49 | 49 |
| 50 InjectedScriptManager::InjectedScriptManager() | 50 InjectedScriptManager::InjectedScriptManager() |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 | 167 |
| 168 // TODO(yurys): InjecedScript should be available as a regular module rather
that using a global variable. | 168 // TODO(yurys): InjecedScript should be available as a regular module rather
that using a global variable. |
| 169 v8::Isolate* isolate = inspectedScriptState->isolate(); | 169 v8::Isolate* isolate = inspectedScriptState->isolate(); |
| 170 v8::Local<v8::Object> global = inspectedScriptState->context()->Global(); | 170 v8::Local<v8::Object> global = inspectedScriptState->context()->Global(); |
| 171 global->Set(v8::String::NewFromUtf8(isolate, "injectedScript"), injectedScri
ptValue.v8ValueUnsafe()); | 171 global->Set(v8::String::NewFromUtf8(isolate, "injectedScript"), injectedScri
ptValue.v8ValueUnsafe()); |
| 172 return result; | 172 return result; |
| 173 } | 173 } |
| 174 | 174 |
| 175 } // namespace blink | 175 } // namespace blink |
| 176 | 176 |
| OLD | NEW |