| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 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/InspectorRuntimeAgent.h" | 32 #include "core/inspector/InspectorRuntimeAgent.h" |
| 33 | 33 |
| 34 #include "bindings/core/v8/DOMWrapperWorld.h" |
| 34 #include "bindings/core/v8/ScriptDebugServer.h" | 35 #include "bindings/core/v8/ScriptDebugServer.h" |
| 35 #include "bindings/core/v8/ScriptState.h" | 36 #include "bindings/core/v8/ScriptState.h" |
| 36 #include "core/inspector/InjectedScript.h" | 37 #include "core/inspector/InjectedScript.h" |
| 37 #include "core/inspector/InjectedScriptManager.h" | 38 #include "core/inspector/InjectedScriptManager.h" |
| 38 #include "core/inspector/InspectorState.h" | 39 #include "core/inspector/InspectorState.h" |
| 39 #include "platform/JSONValues.h" | 40 #include "platform/JSONValues.h" |
| 40 | 41 |
| 41 using blink::TypeBuilder::Runtime::ExecutionContextDescription; | 42 using blink::TypeBuilder::Runtime::ExecutionContextDescription; |
| 42 | 43 |
| 43 namespace blink { | 44 namespace blink { |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 void InspectorRuntimeAgent::disable(ErrorString* errorString) | 205 void InspectorRuntimeAgent::disable(ErrorString* errorString) |
| 205 { | 206 { |
| 206 if (!m_enabled) | 207 if (!m_enabled) |
| 207 return; | 208 return; |
| 208 | 209 |
| 209 m_scriptStateToId.clear(); | 210 m_scriptStateToId.clear(); |
| 210 m_enabled = false; | 211 m_enabled = false; |
| 211 m_state->setBoolean(InspectorRuntimeAgentState::runtimeEnabled, false); | 212 m_state->setBoolean(InspectorRuntimeAgentState::runtimeEnabled, false); |
| 212 } | 213 } |
| 213 | 214 |
| 214 void InspectorRuntimeAgent::addExecutionContextToFrontend(ScriptState* scriptSta
te, bool isPageContext, const String& name, const String& frameId) | 215 void InspectorRuntimeAgent::addExecutionContextToFrontend(ScriptState* scriptSta
te, bool isPageContext, const String& origin, const String& frameId) |
| 215 { | 216 { |
| 216 int executionContextId = injectedScriptManager()->injectedScriptIdFor(script
State); | 217 int executionContextId = injectedScriptManager()->injectedScriptIdFor(script
State); |
| 217 m_scriptStateToId.set(scriptState, executionContextId); | 218 m_scriptStateToId.set(scriptState, executionContextId); |
| 219 DOMWrapperWorld& world = scriptState->world(); |
| 220 String humanReadableName = world.isIsolatedWorld() ? world.isolatedWorldHuma
nReadableName() : ""; |
| 218 m_frontend->executionContextCreated(ExecutionContextDescription::create() | 221 m_frontend->executionContextCreated(ExecutionContextDescription::create() |
| 219 .setId(executionContextId) | 222 .setId(executionContextId) |
| 220 .setIsPageContext(isPageContext) | 223 .setIsPageContext(isPageContext) |
| 221 .setName(name) | 224 .setName(humanReadableName) |
| 225 .setOrigin(origin) |
| 222 .setFrameId(frameId) | 226 .setFrameId(frameId) |
| 223 .release()); | 227 .release()); |
| 224 } | 228 } |
| 225 | 229 |
| 226 } // namespace blink | 230 } // namespace blink |
| 227 | 231 |
| OLD | NEW |