| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 55 |
| 56 PageRuntimeAgent::~PageRuntimeAgent() | 56 PageRuntimeAgent::~PageRuntimeAgent() |
| 57 { | 57 { |
| 58 #if !ENABLE(OILPAN) | 58 #if !ENABLE(OILPAN) |
| 59 m_instrumentingAgents->setPageRuntimeAgent(0); | 59 m_instrumentingAgents->setPageRuntimeAgent(0); |
| 60 #endif | 60 #endif |
| 61 } | 61 } |
| 62 | 62 |
| 63 DEFINE_TRACE(PageRuntimeAgent) | 63 DEFINE_TRACE(PageRuntimeAgent) |
| 64 { | 64 { |
| 65 visitor->trace(m_inspectedFrames); |
| 65 InspectorRuntimeAgent::trace(visitor); | 66 InspectorRuntimeAgent::trace(visitor); |
| 66 } | 67 } |
| 67 | 68 |
| 68 void PageRuntimeAgent::init() | 69 void PageRuntimeAgent::init() |
| 69 { | 70 { |
| 70 InspectorRuntimeAgent::init(); | 71 InspectorRuntimeAgent::init(); |
| 71 m_instrumentingAgents->setPageRuntimeAgent(this); | 72 m_instrumentingAgents->setPageRuntimeAgent(this); |
| 72 } | 73 } |
| 73 | 74 |
| 74 void PageRuntimeAgent::enable(ErrorString* errorString) | 75 void PageRuntimeAgent::enable(ErrorString* errorString) |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 { | 169 { |
| 169 int executionContextId = injectedScriptManager()->injectedScriptIdFor(script
State); | 170 int executionContextId = injectedScriptManager()->injectedScriptIdFor(script
State); |
| 170 m_scriptStateToId.set(scriptState, executionContextId); | 171 m_scriptStateToId.set(scriptState, executionContextId); |
| 171 DOMWrapperWorld& world = scriptState->world(); | 172 DOMWrapperWorld& world = scriptState->world(); |
| 172 String humanReadableName = world.isIsolatedWorld() ? world.isolatedWorldHuma
nReadableName() : ""; | 173 String humanReadableName = world.isIsolatedWorld() ? world.isolatedWorldHuma
nReadableName() : ""; |
| 173 String type = isPageContext ? "" : "Extension"; | 174 String type = isPageContext ? "" : "Extension"; |
| 174 InspectorRuntimeAgent::addExecutionContextToFrontend(executionContextId, typ
e, origin, humanReadableName, frameId); | 175 InspectorRuntimeAgent::addExecutionContextToFrontend(executionContextId, typ
e, origin, humanReadableName, frameId); |
| 175 } | 176 } |
| 176 | 177 |
| 177 } // namespace blink | 178 } // namespace blink |
| 178 | |
| OLD | NEW |