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

Side by Side Diff: Source/WebCore/inspector/InspectorController.cpp

Issue 13774005: Remove the ENABLE_SQL_DATABASE compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: python Created 7 years, 8 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) 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 InspectorPageAgent* pageAgent = pageAgentPtr.get(); 93 InspectorPageAgent* pageAgent = pageAgentPtr.get();
94 m_pageAgent = pageAgentPtr.get(); 94 m_pageAgent = pageAgentPtr.get();
95 m_agents.append(pageAgentPtr.release()); 95 m_agents.append(pageAgentPtr.release());
96 96
97 OwnPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(m_instrument ingAgents.get(), pageAgent, m_state.get(), m_injectedScriptManager.get(), m_over lay.get(), inspectorClient)); 97 OwnPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(m_instrument ingAgents.get(), pageAgent, m_state.get(), m_injectedScriptManager.get(), m_over lay.get(), inspectorClient));
98 m_domAgent = domAgentPtr.get(); 98 m_domAgent = domAgentPtr.get();
99 m_agents.append(domAgentPtr.release()); 99 m_agents.append(domAgentPtr.release());
100 100
101 m_agents.append(InspectorCSSAgent::create(m_instrumentingAgents.get(), m_sta te.get(), m_domAgent)); 101 m_agents.append(InspectorCSSAgent::create(m_instrumentingAgents.get(), m_sta te.get(), m_domAgent));
102 102
103 #if ENABLE(SQL_DATABASE)
104 OwnPtr<InspectorDatabaseAgent> databaseAgentPtr(InspectorDatabaseAgent::crea te(m_instrumentingAgents.get(), m_state.get())); 103 OwnPtr<InspectorDatabaseAgent> databaseAgentPtr(InspectorDatabaseAgent::crea te(m_instrumentingAgents.get(), m_state.get()));
105 InspectorDatabaseAgent* databaseAgent = databaseAgentPtr.get(); 104 InspectorDatabaseAgent* databaseAgent = databaseAgentPtr.get();
106 m_agents.append(databaseAgentPtr.release()); 105 m_agents.append(databaseAgentPtr.release());
107 #endif
108 106
109 m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), pageAgent)); 107 m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), pageAgent));
110 108
111 #if ENABLE(FILE_SYSTEM) 109 #if ENABLE(FILE_SYSTEM)
112 m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get() , pageAgent, m_state.get())); 110 m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get() , pageAgent, m_state.get()));
113 #endif 111 #endif
114 OwnPtr<InspectorDOMStorageAgent> domStorageAgentPtr(InspectorDOMStorageAgent ::create(m_instrumentingAgents.get(), m_pageAgent, m_state.get())); 112 OwnPtr<InspectorDOMStorageAgent> domStorageAgentPtr(InspectorDOMStorageAgent ::create(m_instrumentingAgents.get(), m_pageAgent, m_state.get()));
115 InspectorDOMStorageAgent* domStorageAgent = domStorageAgentPtr.get(); 113 InspectorDOMStorageAgent* domStorageAgent = domStorageAgentPtr.get();
116 m_agents.append(domStorageAgentPtr.release()); 114 m_agents.append(domStorageAgentPtr.release());
117 115
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 156
159 m_agents.append(InspectorInputAgent::create(m_instrumentingAgents.get(), m_s tate.get(), page)); 157 m_agents.append(InspectorInputAgent::create(m_instrumentingAgents.get(), m_s tate.get(), page));
160 158
161 #if USE(ACCELERATED_COMPOSITING) 159 #if USE(ACCELERATED_COMPOSITING)
162 m_agents.append(InspectorLayerTreeAgent::create(m_instrumentingAgents.get(), m_state.get())); 160 m_agents.append(InspectorLayerTreeAgent::create(m_instrumentingAgents.get(), m_state.get()));
163 #endif 161 #endif
164 162
165 ASSERT_ARG(inspectorClient, inspectorClient); 163 ASSERT_ARG(inspectorClient, inspectorClient);
166 m_injectedScriptManager->injectedScriptHost()->init(m_inspectorAgent 164 m_injectedScriptManager->injectedScriptHost()->init(m_inspectorAgent
167 , consoleAgent 165 , consoleAgent
168 #if ENABLE(SQL_DATABASE)
169 , databaseAgent 166 , databaseAgent
170 #endif
171 , domStorageAgent 167 , domStorageAgent
172 , m_domAgent 168 , m_domAgent
173 , m_debuggerAgent 169 , m_debuggerAgent
174 ); 170 );
175 171
176 runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer()); 172 runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
177 } 173 }
178 174
179 InspectorController::~InspectorController() 175 InspectorController::~InspectorController()
180 { 176 {
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 419
424 HashMap<String, size_t> InspectorController::processMemoryDistribution() const 420 HashMap<String, size_t> InspectorController::processMemoryDistribution() const
425 { 421 {
426 HashMap<String, size_t> memoryInfo; 422 HashMap<String, size_t> memoryInfo;
427 m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo); 423 m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo);
428 return memoryInfo; 424 return memoryInfo;
429 } 425 }
430 426
431 } // namespace WebCore 427 } // namespace WebCore
432 428
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InjectedScriptHost.cpp ('k') | Source/WebCore/inspector/InspectorDatabaseAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698