| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> | 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> |
| 4 * Copyright (C) 2012 Google Inc. All rights reserved. | 4 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| 43 | 43 |
| 44 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage() | 44 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage() |
| 45 { | 45 { |
| 46 return adoptPtr(new InjectedScriptManager(&InjectedScriptManager::canAccessI
nspectedWindow)); | 46 return adoptPtr(new InjectedScriptManager(&InjectedScriptManager::canAccessI
nspectedWindow)); |
| 47 } | 47 } |
| 48 | 48 |
| 49 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForWorker() | 49 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForWorker() |
| 50 { | 50 { |
| 51 return adoptPtr(new InjectedScriptManager(&InjectedScriptManager::canAccessI
nspectedWorkerContext)); | 51 return adoptPtr(new InjectedScriptManager(&InjectedScriptManager::canAccessI
nspectedWorkerGlobalScope)); |
| 52 } | 52 } |
| 53 | 53 |
| 54 InjectedScriptManager::InjectedScriptManager(InspectedStateAccessCheck accessChe
ck) | 54 InjectedScriptManager::InjectedScriptManager(InspectedStateAccessCheck accessChe
ck) |
| 55 : m_nextInjectedScriptId(1) | 55 : m_nextInjectedScriptId(1) |
| 56 , m_injectedScriptHost(InjectedScriptHost::create()) | 56 , m_injectedScriptHost(InjectedScriptHost::create()) |
| 57 , m_inspectedStateAccessCheck(accessCheck) | 57 , m_inspectedStateAccessCheck(accessCheck) |
| 58 { | 58 { |
| 59 } | 59 } |
| 60 | 60 |
| 61 InjectedScriptManager::~InjectedScriptManager() | 61 InjectedScriptManager::~InjectedScriptManager() |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 Vector<ScriptState*> scriptStatesToRemove; | 135 Vector<ScriptState*> scriptStatesToRemove; |
| 136 for (ScriptStateToId::iterator it = m_scriptStateToId.begin(); it != m_scrip
tStateToId.end(); ++it) { | 136 for (ScriptStateToId::iterator it = m_scriptStateToId.begin(); it != m_scrip
tStateToId.end(); ++it) { |
| 137 ScriptState* scriptState = it->key; | 137 ScriptState* scriptState = it->key; |
| 138 if (window == scriptState->domWindow()) | 138 if (window == scriptState->domWindow()) |
| 139 scriptStatesToRemove.append(scriptState); | 139 scriptStatesToRemove.append(scriptState); |
| 140 } | 140 } |
| 141 for (size_t i = 0; i < scriptStatesToRemove.size(); i++) | 141 for (size_t i = 0; i < scriptStatesToRemove.size(); i++) |
| 142 m_scriptStateToId.remove(scriptStatesToRemove[i]); | 142 m_scriptStateToId.remove(scriptStatesToRemove[i]); |
| 143 } | 143 } |
| 144 | 144 |
| 145 bool InjectedScriptManager::canAccessInspectedWorkerContext(ScriptState*) | 145 bool InjectedScriptManager::canAccessInspectedWorkerGlobalScope(ScriptState*) |
| 146 { | 146 { |
| 147 return true; | 147 return true; |
| 148 } | 148 } |
| 149 | 149 |
| 150 void InjectedScriptManager::releaseObjectGroup(const String& objectGroup) | 150 void InjectedScriptManager::releaseObjectGroup(const String& objectGroup) |
| 151 { | 151 { |
| 152 for (IdToInjectedScriptMap::iterator it = m_idToInjectedScript.begin(); it !
= m_idToInjectedScript.end(); ++it) | 152 for (IdToInjectedScriptMap::iterator it = m_idToInjectedScript.begin(); it !
= m_idToInjectedScript.end(); ++it) |
| 153 it->value.releaseObjectGroup(objectGroup); | 153 it->value.releaseObjectGroup(objectGroup); |
| 154 } | 154 } |
| 155 | 155 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 172 | 172 |
| 173 int id = injectedScriptIdFor(inspectedScriptState); | 173 int id = injectedScriptIdFor(inspectedScriptState); |
| 174 ScriptObject injectedScriptObject = createInjectedScript(injectedScriptSourc
e(), inspectedScriptState, id); | 174 ScriptObject injectedScriptObject = createInjectedScript(injectedScriptSourc
e(), inspectedScriptState, id); |
| 175 InjectedScript result(injectedScriptObject, m_inspectedStateAccessCheck); | 175 InjectedScript result(injectedScriptObject, m_inspectedStateAccessCheck); |
| 176 m_idToInjectedScript.set(id, result); | 176 m_idToInjectedScript.set(id, result); |
| 177 return result; | 177 return result; |
| 178 } | 178 } |
| 179 | 179 |
| 180 } // namespace WebCore | 180 } // namespace WebCore |
| 181 | 181 |
| OLD | NEW |