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

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

Issue 10779021: Merge 120822 - Web Inspector: don't report context ids before DidCommitLoad (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « no previous file | Source/WebCore/inspector/PageRuntimeAgent.h » ('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) 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 m_agents.append(domStorageAgentPtr.release()); 114 m_agents.append(domStorageAgentPtr.release());
115 m_agents.append(InspectorMemoryAgent::create(m_instrumentingAgents.get(), m_ state.get(), m_page, m_domAgent)); 115 m_agents.append(InspectorMemoryAgent::create(m_instrumentingAgents.get(), m_ state.get(), m_page, m_domAgent));
116 m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), pageAgent, m_state.get(), InspectorTimelineAgent::PageInspector, 116 m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), pageAgent, m_state.get(), InspectorTimelineAgent::PageInspector,
117 inspectorClient)); 117 inspectorClient));
118 m_agents.append(InspectorApplicationCacheAgent::create(m_instrumentingAgents .get(), m_state.get(), pageAgent)); 118 m_agents.append(InspectorApplicationCacheAgent::create(m_instrumentingAgents .get(), m_state.get(), pageAgent));
119 119
120 OwnPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::crea te(m_instrumentingAgents.get(), pageAgent, inspectorClient, m_state.get())); 120 OwnPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::crea te(m_instrumentingAgents.get(), pageAgent, inspectorClient, m_state.get()));
121 m_resourceAgent = resourceAgentPtr.get(); 121 m_resourceAgent = resourceAgentPtr.get();
122 m_agents.append(resourceAgentPtr.release()); 122 m_agents.append(resourceAgentPtr.release());
123 123
124 OwnPtr<InspectorRuntimeAgent> runtimeAgentPtr(PageRuntimeAgent::create(m_ins trumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), page, page Agent)); 124 OwnPtr<InspectorRuntimeAgent> runtimeAgentPtr(PageRuntimeAgent::create(m_ins trumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), page, page Agent, m_inspectorAgent));
125 InspectorRuntimeAgent* runtimeAgent = runtimeAgentPtr.get(); 125 InspectorRuntimeAgent* runtimeAgent = runtimeAgentPtr.get();
126 m_agents.append(runtimeAgentPtr.release()); 126 m_agents.append(runtimeAgentPtr.release());
127 127
128 OwnPtr<InspectorConsoleAgent> consoleAgentPtr(PageConsoleAgent::create(m_ins trumentingAgents.get(), m_inspectorAgent, m_state.get(), m_injectedScriptManager .get(), m_domAgent)); 128 OwnPtr<InspectorConsoleAgent> consoleAgentPtr(PageConsoleAgent::create(m_ins trumentingAgents.get(), m_inspectorAgent, m_state.get(), m_injectedScriptManager .get(), m_domAgent));
129 InspectorConsoleAgent* consoleAgent = consoleAgentPtr.get(); 129 InspectorConsoleAgent* consoleAgent = consoleAgentPtr.get();
130 m_agents.append(consoleAgentPtr.release()); 130 m_agents.append(consoleAgentPtr.release());
131 131
132 #if ENABLE(JAVASCRIPT_DEBUGGER) 132 #if ENABLE(JAVASCRIPT_DEBUGGER)
133 OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(m_ instrumentingAgents.get(), m_state.get(), page, m_injectedScriptManager.get())); 133 OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(m_ instrumentingAgents.get(), m_state.get(), page, m_injectedScriptManager.get()));
134 m_debuggerAgent = debuggerAgentPtr.get(); 134 m_debuggerAgent = debuggerAgentPtr.get();
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 #endif 369 #endif
370 370
371 void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumRes ourcesContentSize, int maximumSingleResourceContentSize) 371 void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumRes ourcesContentSize, int maximumSingleResourceContentSize)
372 { 372 {
373 m_resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesCon tentSize, maximumSingleResourceContentSize); 373 m_resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesCon tentSize, maximumSingleResourceContentSize);
374 } 374 }
375 375
376 } // namespace WebCore 376 } // namespace WebCore
377 377
378 #endif // ENABLE(INSPECTOR) 378 #endif // ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/PageRuntimeAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698