| 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 } | 123 } |
| 124 | 124 |
| 125 void PageRuntimeAgent::unmuteConsole() | 125 void PageRuntimeAgent::unmuteConsole() |
| 126 { | 126 { |
| 127 FrameConsole::unmute(); | 127 FrameConsole::unmute(); |
| 128 } | 128 } |
| 129 | 129 |
| 130 void PageRuntimeAgent::reportExecutionContextCreation() | 130 void PageRuntimeAgent::reportExecutionContextCreation() |
| 131 { | 131 { |
| 132 Vector<std::pair<ScriptState*, SecurityOrigin*> > isolatedContexts; | 132 Vector<std::pair<ScriptState*, SecurityOrigin*> > isolatedContexts; |
| 133 for (LocalFrame* frame = m_inspectedPage->mainFrame(); frame; frame = frame-
>tree().traverseNext()) { | 133 for (Frame* frame = m_inspectedPage->mainFrame(); frame; frame = frame->tree
().traverseNext()) { |
| 134 if (!frame->script().canExecuteScripts(NotAboutToExecuteScript)) | 134 if (!frame->isLocalFrame()) |
| 135 continue; | 135 continue; |
| 136 String frameId = m_pageAgent->frameId(frame); | 136 LocalFrame* localFrame = toLocalFrame(frame); |
| 137 if (!localFrame->script().canExecuteScripts(NotAboutToExecuteScript)) |
| 138 continue; |
| 139 String frameId = m_pageAgent->frameId(localFrame); |
| 137 | 140 |
| 138 ScriptState* scriptState = ScriptState::forMainWorld(frame); | 141 ScriptState* scriptState = ScriptState::forMainWorld(localFrame); |
| 139 addExecutionContextToFrontend(scriptState, true, "", frameId); | 142 addExecutionContextToFrontend(scriptState, true, "", frameId); |
| 140 frame->script().collectIsolatedContexts(isolatedContexts); | 143 localFrame->script().collectIsolatedContexts(isolatedContexts); |
| 141 if (isolatedContexts.isEmpty()) | 144 if (isolatedContexts.isEmpty()) |
| 142 continue; | 145 continue; |
| 143 for (size_t i = 0; i< isolatedContexts.size(); i++) | 146 for (size_t i = 0; i< isolatedContexts.size(); i++) |
| 144 addExecutionContextToFrontend(isolatedContexts[i].first, false, isol
atedContexts[i].second->toRawString(), frameId); | 147 addExecutionContextToFrontend(isolatedContexts[i].first, false, isol
atedContexts[i].second->toRawString(), frameId); |
| 145 isolatedContexts.clear(); | 148 isolatedContexts.clear(); |
| 146 } | 149 } |
| 147 } | 150 } |
| 148 | 151 |
| 149 void PageRuntimeAgent::frameWindowDiscarded(DOMWindow* window) | 152 void PageRuntimeAgent::frameWindowDiscarded(DOMWindow* window) |
| 150 { | 153 { |
| 151 Vector<RefPtr<ScriptState> > scriptStatesToRemove; | 154 Vector<RefPtr<ScriptState> > scriptStatesToRemove; |
| 152 for (ScriptStateToId::iterator it = m_scriptStateToId.begin(); it != m_scrip
tStateToId.end(); ++it) { | 155 for (ScriptStateToId::iterator it = m_scriptStateToId.begin(); it != m_scrip
tStateToId.end(); ++it) { |
| 153 RefPtr<ScriptState> scriptState = it->key; | 156 RefPtr<ScriptState> scriptState = it->key; |
| 154 if (scriptState->contextIsEmpty() || window == scriptState->domWindow())
{ | 157 if (scriptState->contextIsEmpty() || window == scriptState->domWindow())
{ |
| 155 scriptStatesToRemove.append(scriptState); | 158 scriptStatesToRemove.append(scriptState); |
| 156 m_frontend->executionContextDestroyed(it->value); | 159 m_frontend->executionContextDestroyed(it->value); |
| 157 } | 160 } |
| 158 } | 161 } |
| 159 m_scriptStateToId.removeAll(scriptStatesToRemove); | 162 m_scriptStateToId.removeAll(scriptStatesToRemove); |
| 160 } | 163 } |
| 161 | 164 |
| 162 } // namespace WebCore | 165 } // namespace WebCore |
| 163 | 166 |
| OLD | NEW |