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

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

Issue 13497009: Remove ENABLE(FILE_SYSTEM) compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: added CodeGeneratorInspector.py change 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
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) 103 #if ENABLE(SQL_DATABASE)
104 OwnPtr<InspectorDatabaseAgent> databaseAgentPtr(InspectorDatabaseAgent::crea te(m_instrumentingAgents.get(), m_state.get())); 104 OwnPtr<InspectorDatabaseAgent> databaseAgentPtr(InspectorDatabaseAgent::crea te(m_instrumentingAgents.get(), m_state.get()));
105 InspectorDatabaseAgent* databaseAgent = databaseAgentPtr.get(); 105 InspectorDatabaseAgent* databaseAgent = databaseAgentPtr.get();
106 m_agents.append(databaseAgentPtr.release()); 106 m_agents.append(databaseAgentPtr.release());
107 #endif 107 #endif
108 108
109 m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), pageAgent)); 109 m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), pageAgent));
110 110
111 #if ENABLE(FILE_SYSTEM)
112 m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get() , pageAgent, m_state.get())); 111 m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get() , pageAgent, m_state.get()));
113 #endif 112
114 OwnPtr<InspectorDOMStorageAgent> domStorageAgentPtr(InspectorDOMStorageAgent ::create(m_instrumentingAgents.get(), m_pageAgent, m_state.get())); 113 OwnPtr<InspectorDOMStorageAgent> domStorageAgentPtr(InspectorDOMStorageAgent ::create(m_instrumentingAgents.get(), m_pageAgent, m_state.get()));
115 InspectorDOMStorageAgent* domStorageAgent = domStorageAgentPtr.get(); 114 InspectorDOMStorageAgent* domStorageAgent = domStorageAgentPtr.get();
116 m_agents.append(domStorageAgentPtr.release()); 115 m_agents.append(domStorageAgentPtr.release());
117 116
118 OwnPtr<InspectorMemoryAgent> memoryAgentPtr(InspectorMemoryAgent::create(m_i nstrumentingAgents.get(), inspectorClient, m_state.get(), m_page)); 117 OwnPtr<InspectorMemoryAgent> memoryAgentPtr(InspectorMemoryAgent::create(m_i nstrumentingAgents.get(), inspectorClient, m_state.get(), m_page));
119 m_memoryAgent = memoryAgentPtr.get(); 118 m_memoryAgent = memoryAgentPtr.get();
120 m_agents.append(memoryAgentPtr.release()); 119 m_agents.append(memoryAgentPtr.release());
121 120
122 m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), pageAgent, m_memoryAgent, m_state.get(), InspectorTimelineAgent::PageInspector, 121 m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), pageAgent, m_memoryAgent, m_state.get(), InspectorTimelineAgent::PageInspector,
123 inspectorClient)); 122 inspectorClient));
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 } 421 }
423 422
424 HashMap<String, size_t> InspectorController::processMemoryDistribution() const 423 HashMap<String, size_t> InspectorController::processMemoryDistribution() const
425 { 424 {
426 HashMap<String, size_t> memoryInfo; 425 HashMap<String, size_t> memoryInfo;
427 m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo); 426 m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo);
428 return memoryInfo; 427 return memoryInfo;
429 } 428 }
430 429
431 } // namespace WebCore 430 } // namespace WebCore
432
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/CodeGeneratorInspector.py ('k') | Source/WebCore/inspector/InspectorFileSystemAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698