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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 addExecutionContextToFrontend(isolatedContexts[i].first, false, isol
atedContexts[i].second->toRawString(), frameId); | 163 addExecutionContextToFrontend(isolatedContexts[i].first, false, isol
atedContexts[i].second->toRawString(), frameId); |
164 isolatedContexts.clear(); | 164 isolatedContexts.clear(); |
165 } | 165 } |
166 } | 166 } |
167 | 167 |
168 void PageRuntimeAgent::frameWindowDiscarded(LocalDOMWindow* window) | 168 void PageRuntimeAgent::frameWindowDiscarded(LocalDOMWindow* window) |
169 { | 169 { |
170 Vector<RefPtr<ScriptState> > scriptStatesToRemove; | 170 Vector<RefPtr<ScriptState> > scriptStatesToRemove; |
171 for (ScriptStateToId::iterator it = m_scriptStateToId.begin(); it != m_scrip
tStateToId.end(); ++it) { | 171 for (ScriptStateToId::iterator it = m_scriptStateToId.begin(); it != m_scrip
tStateToId.end(); ++it) { |
172 RefPtr<ScriptState> scriptState = it->key; | 172 RefPtr<ScriptState> scriptState = it->key; |
173 if (scriptState->contextIsValid() || window == scriptState->domWindow())
{ | 173 if (!scriptState->contextIsValid() || window == scriptState->domWindow()
) { |
174 scriptStatesToRemove.append(scriptState); | 174 scriptStatesToRemove.append(scriptState); |
175 m_frontend->executionContextDestroyed(it->value); | 175 m_frontend->executionContextDestroyed(it->value); |
176 } | 176 } |
177 } | 177 } |
178 m_scriptStateToId.removeAll(scriptStatesToRemove); | 178 m_scriptStateToId.removeAll(scriptStatesToRemove); |
179 injectedScriptManager()->discardInjectedScriptsFor(window); | 179 injectedScriptManager()->discardInjectedScriptsFor(window); |
180 } | 180 } |
181 | 181 |
182 } // namespace blink | 182 } // namespace blink |
183 | 183 |
OLD | NEW |