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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 addExecutionContextToFrontend(scriptState, true, "", frameId); | 142 addExecutionContextToFrontend(scriptState, true, "", frameId); |
143 localFrame->script().collectIsolatedContexts(isolatedContexts); | 143 localFrame->script().collectIsolatedContexts(isolatedContexts); |
144 if (isolatedContexts.isEmpty()) | 144 if (isolatedContexts.isEmpty()) |
145 continue; | 145 continue; |
146 for (size_t i = 0; i< isolatedContexts.size(); i++) | 146 for (size_t i = 0; i< isolatedContexts.size(); i++) |
147 addExecutionContextToFrontend(isolatedContexts[i].first, false, isol
atedContexts[i].second->toRawString(), frameId); | 147 addExecutionContextToFrontend(isolatedContexts[i].first, false, isol
atedContexts[i].second->toRawString(), frameId); |
148 isolatedContexts.clear(); | 148 isolatedContexts.clear(); |
149 } | 149 } |
150 } | 150 } |
151 | 151 |
152 void PageRuntimeAgent::frameWindowDiscarded(DOMWindow* window) | 152 void PageRuntimeAgent::frameWindowDiscarded(LocalDOMWindow* window) |
153 { | 153 { |
154 Vector<RefPtr<ScriptState> > scriptStatesToRemove; | 154 Vector<RefPtr<ScriptState> > scriptStatesToRemove; |
155 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) { |
156 RefPtr<ScriptState> scriptState = it->key; | 156 RefPtr<ScriptState> scriptState = it->key; |
157 if (scriptState->contextIsEmpty() || window == scriptState->domWindow())
{ | 157 if (scriptState->contextIsEmpty() || window == scriptState->domWindow())
{ |
158 scriptStatesToRemove.append(scriptState); | 158 scriptStatesToRemove.append(scriptState); |
159 m_frontend->executionContextDestroyed(it->value); | 159 m_frontend->executionContextDestroyed(it->value); |
160 } | 160 } |
161 } | 161 } |
162 m_scriptStateToId.removeAll(scriptStatesToRemove); | 162 m_scriptStateToId.removeAll(scriptStatesToRemove); |
163 } | 163 } |
164 | 164 |
165 } // namespace WebCore | 165 } // namespace WebCore |
166 | 166 |
OLD | NEW |