Chromium Code Reviews| 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 157 if (it != m_scriptStateToId.end()) { | 157 if (it != m_scriptStateToId.end()) { |
| 158 IdToInjectedScriptMap::iterator it1 = m_idToInjectedScript.find(it->valu e); | 158 IdToInjectedScriptMap::iterator it1 = m_idToInjectedScript.find(it->valu e); |
| 159 if (it1 != m_idToInjectedScript.end()) | 159 if (it1 != m_idToInjectedScript.end()) |
| 160 return it1->value; | 160 return it1->value; |
| 161 } | 161 } |
| 162 | 162 |
| 163 int id = injectedScriptIdFor(inspectedScriptState); | 163 int id = injectedScriptIdFor(inspectedScriptState); |
| 164 ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource( ), inspectedScriptState, id); | 164 ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource( ), inspectedScriptState, id); |
| 165 InjectedScript result(injectedScriptValue); | 165 InjectedScript result(injectedScriptValue); |
| 166 m_idToInjectedScript.set(id, result); | 166 m_idToInjectedScript.set(id, result); |
| 167 | |
| 168 // FIXME(sky): InjecedScript should be available as a regular module rather that using a global variable. | |
|
abarth-chromium
2014/11/27 17:17:34
I'd just use a TODO(yurys) here. FIXME(sky) is to
yurys
2014/11/27 17:57:04
Done.
| |
| 169 v8::Isolate* isolate = inspectedScriptState->isolate(); | |
| 170 v8::Local<v8::Object> global = inspectedScriptState->context()->Global(); | |
| 171 global->Set(v8::String::NewFromUtf8(isolate, "injectedScript"), injectedScri ptValue.v8ValueUnsafe()); | |
| 167 return result; | 172 return result; |
| 168 } | 173 } |
| 169 | 174 |
| 170 } // namespace blink | 175 } // namespace blink |
| 171 | 176 |
| OLD | NEW |