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

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

Issue 25447002: Move JSONValues.cpp/.h to Source/platform/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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
« no previous file with comments | « Source/core/inspector/InjectedScriptHost.cpp ('k') | Source/core/inspector/InspectorAgent.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 18 matching lines...) Expand all
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/ScriptObject.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 "core/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 {
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()
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « Source/core/inspector/InjectedScriptHost.cpp ('k') | Source/core/inspector/InspectorAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698