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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1610213002: allocator cleanup: remove memory benchmarking extension (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_nonbase_tcmalloc_2
Patch Set: Remove from ipc_message_start.h Created 4 years, 11 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 | « content/renderer/memory_benchmarking_extension.cc ('k') | ipc/ipc_message_start.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 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 #include "content/renderer/media/cdm/render_cdm_factory.h" 98 #include "content/renderer/media/cdm/render_cdm_factory.h"
99 #include "content/renderer/media/media_permission_dispatcher_impl.h" 99 #include "content/renderer/media/media_permission_dispatcher_impl.h"
100 #include "content/renderer/media/media_permission_dispatcher_proxy.h" 100 #include "content/renderer/media/media_permission_dispatcher_proxy.h"
101 #include "content/renderer/media/media_stream_dispatcher.h" 101 #include "content/renderer/media/media_stream_dispatcher.h"
102 #include "content/renderer/media/media_stream_renderer_factory_impl.h" 102 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
103 #include "content/renderer/media/midi_dispatcher.h" 103 #include "content/renderer/media/midi_dispatcher.h"
104 #include "content/renderer/media/render_media_log.h" 104 #include "content/renderer/media/render_media_log.h"
105 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" 105 #include "content/renderer/media/renderer_webmediaplayer_delegate.h"
106 #include "content/renderer/media/user_media_client_impl.h" 106 #include "content/renderer/media/user_media_client_impl.h"
107 #include "content/renderer/media/webmediaplayer_ms.h" 107 #include "content/renderer/media/webmediaplayer_ms.h"
108 #include "content/renderer/memory_benchmarking_extension.h"
109 #include "content/renderer/mojo/service_registry_js_wrapper.h" 108 #include "content/renderer/mojo/service_registry_js_wrapper.h"
110 #include "content/renderer/mojo_bindings_controller.h" 109 #include "content/renderer/mojo_bindings_controller.h"
111 #include "content/renderer/navigation_state_impl.h" 110 #include "content/renderer/navigation_state_impl.h"
112 #include "content/renderer/notification_permission_dispatcher.h" 111 #include "content/renderer/notification_permission_dispatcher.h"
113 #include "content/renderer/npapi/plugin_channel_host.h" 112 #include "content/renderer/npapi/plugin_channel_host.h"
114 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 113 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
115 #include "content/renderer/presentation/presentation_dispatcher.h" 114 #include "content/renderer/presentation/presentation_dispatcher.h"
116 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" 115 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
117 #include "content/renderer/render_frame_proxy.h" 116 #include "content/renderer/render_frame_proxy.h"
118 #include "content/renderer/render_process.h" 117 #include "content/renderer/render_process.h"
(...skipping 3147 matching lines...) Expand 10 before | Expand all | Expand 10 after
3266 3265
3267 if (enabled_bindings & BINDINGS_POLICY_STATS_COLLECTION) 3266 if (enabled_bindings & BINDINGS_POLICY_STATS_COLLECTION)
3268 StatsCollectionController::Install(frame); 3267 StatsCollectionController::Install(frame);
3269 3268
3270 const base::CommandLine& command_line = 3269 const base::CommandLine& command_line =
3271 *base::CommandLine::ForCurrentProcess(); 3270 *base::CommandLine::ForCurrentProcess();
3272 3271
3273 if (command_line.HasSwitch(cc::switches::kEnableGpuBenchmarking)) 3272 if (command_line.HasSwitch(cc::switches::kEnableGpuBenchmarking))
3274 GpuBenchmarking::Install(frame); 3273 GpuBenchmarking::Install(frame);
3275 3274
3276 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking))
3277 MemoryBenchmarkingExtension::Install(frame);
3278
3279 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking)) 3275 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking))
3280 SkiaBenchmarking::Install(frame); 3276 SkiaBenchmarking::Install(frame);
3281 3277
3282 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), 3278 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
3283 DidClearWindowObject(frame)); 3279 DidClearWindowObject(frame));
3284 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidClearWindowObject()); 3280 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidClearWindowObject());
3285 } 3281 }
3286 3282
3287 void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) { 3283 void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) {
3288 DCHECK(!frame_ || frame_ == frame); 3284 DCHECK(!frame_ || frame_ == frame);
(...skipping 2760 matching lines...) Expand 10 before | Expand all | Expand 10 after
6049 int match_count, 6045 int match_count,
6050 int ordinal, 6046 int ordinal,
6051 const WebRect& selection_rect, 6047 const WebRect& selection_rect,
6052 bool final_status_update) { 6048 bool final_status_update) {
6053 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6049 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6054 selection_rect, ordinal, 6050 selection_rect, ordinal,
6055 final_status_update)); 6051 final_status_update));
6056 } 6052 }
6057 6053
6058 } // namespace content 6054 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/memory_benchmarking_extension.cc ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698