Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: Source/core/inspector/InjectedScriptManager.cpp

Issue 293963003: Remove ScriptObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 14 matching lines...) Expand all
25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 25 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/inspector/InjectedScriptManager.h" 32 #include "core/inspector/InjectedScriptManager.h"
33 33
34 #include "InjectedScriptSource.h" 34 #include "InjectedScriptSource.h"
35 #include "bindings/v8/ScriptObject.h" 35 #include "bindings/v8/ScriptValue.h"
36 #include "core/inspector/InjectedScript.h" 36 #include "core/inspector/InjectedScript.h"
37 #include "core/inspector/InjectedScriptHost.h" 37 #include "core/inspector/InjectedScriptHost.h"
38 #include "core/inspector/JSONParser.h" 38 #include "core/inspector/JSONParser.h"
39 #include "platform/JSONValues.h" 39 #include "platform/JSONValues.h"
40 #include "wtf/PassOwnPtr.h" 40 #include "wtf/PassOwnPtr.h"
41 41
42 namespace WebCore { 42 namespace WebCore {
43 43
44 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage() 44 PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage()
45 { 45 {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 if (it != m_scriptStateToId.end()) { 166 if (it != m_scriptStateToId.end()) {
167 IdToInjectedScriptMap::iterator it1 = m_idToInjectedScript.find(it->valu e); 167 IdToInjectedScriptMap::iterator it1 = m_idToInjectedScript.find(it->valu e);
168 if (it1 != m_idToInjectedScript.end()) 168 if (it1 != m_idToInjectedScript.end())
169 return it1->value; 169 return it1->value;
170 } 170 }
171 171
172 if (!m_inspectedStateAccessCheck(inspectedScriptState)) 172 if (!m_inspectedStateAccessCheck(inspectedScriptState))
173 return InjectedScript(); 173 return InjectedScript();
174 174
175 int id = injectedScriptIdFor(inspectedScriptState); 175 int id = injectedScriptIdFor(inspectedScriptState);
176 ScriptObject injectedScriptObject = createInjectedScript(injectedScriptSourc e(), inspectedScriptState, id); 176 ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource( ), inspectedScriptState, id);
177 InjectedScript result(injectedScriptObject, m_inspectedStateAccessCheck); 177 InjectedScript result(injectedScriptValue, m_inspectedStateAccessCheck);
178 m_idToInjectedScript.set(id, result); 178 m_idToInjectedScript.set(id, result);
179 return result; 179 return result;
180 } 180 }
181 181
182 } // namespace WebCore 182 } // namespace WebCore
183 183
OLDNEW
« no previous file with comments | « Source/core/inspector/InjectedScriptManager.h ('k') | Source/core/inspector/InjectedScriptModule.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698