OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 #include "content/public/renderer/document_state.h" | 70 #include "content/public/renderer/document_state.h" |
71 #include "content/public/renderer/navigation_state.h" | 71 #include "content/public/renderer/navigation_state.h" |
72 #include "content/public/renderer/render_view_observer.h" | 72 #include "content/public/renderer/render_view_observer.h" |
73 #include "content/public/renderer/render_view_visitor.h" | 73 #include "content/public/renderer/render_view_visitor.h" |
74 #include "content/renderer/browser_plugin/browser_plugin.h" | 74 #include "content/renderer/browser_plugin/browser_plugin.h" |
75 #include "content/renderer/browser_plugin/browser_plugin_manager.h" | 75 #include "content/renderer/browser_plugin/browser_plugin_manager.h" |
76 #include "content/renderer/devtools/devtools_agent.h" | 76 #include "content/renderer/devtools/devtools_agent.h" |
77 #include "content/renderer/disambiguation_popup_helper.h" | 77 #include "content/renderer/disambiguation_popup_helper.h" |
78 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" | 78 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" |
79 #include "content/renderer/drop_data_builder.h" | 79 #include "content/renderer/drop_data_builder.h" |
| 80 #include "content/renderer/gpu/gpu_benchmarking_extension.h" |
80 #include "content/renderer/gpu/render_widget_compositor.h" | 81 #include "content/renderer/gpu/render_widget_compositor.h" |
81 #include "content/renderer/history_controller.h" | 82 #include "content/renderer/history_controller.h" |
82 #include "content/renderer/history_serialization.h" | 83 #include "content/renderer/history_serialization.h" |
83 #include "content/renderer/idle_user_detector.h" | 84 #include "content/renderer/idle_user_detector.h" |
84 #include "content/renderer/ime_event_guard.h" | 85 #include "content/renderer/ime_event_guard.h" |
85 #include "content/renderer/input/input_handler_manager.h" | 86 #include "content/renderer/input/input_handler_manager.h" |
86 #include "content/renderer/internal_document_state_data.h" | 87 #include "content/renderer/internal_document_state_data.h" |
87 #include "content/renderer/media/audio_device_factory.h" | 88 #include "content/renderer/media/audio_device_factory.h" |
88 #include "content/renderer/media/video_capture_impl_manager.h" | 89 #include "content/renderer/media/video_capture_impl_manager.h" |
89 #include "content/renderer/memory_benchmarking_extension.h" | 90 #include "content/renderer/memory_benchmarking_extension.h" |
(...skipping 2284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2374 WebUIExtension::Install(frame); | 2375 WebUIExtension::Install(frame); |
2375 | 2376 |
2376 if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION) | 2377 if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION) |
2377 StatsCollectionController::Install(frame); | 2378 StatsCollectionController::Install(frame); |
2378 | 2379 |
2379 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 2380 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
2380 | 2381 |
2381 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking)) | 2382 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking)) |
2382 SkiaBenchmarking::Install(frame); | 2383 SkiaBenchmarking::Install(frame); |
2383 | 2384 |
| 2385 if (command_line.HasSwitch(cc::switches::kEnableGpuBenchmarking)) |
| 2386 GpuBenchmarking::Install(frame); |
| 2387 |
2384 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) | 2388 if (command_line.HasSwitch(switches::kEnableMemoryBenchmarking)) |
2385 MemoryBenchmarkingExtension::Install(frame); | 2389 MemoryBenchmarkingExtension::Install(frame); |
2386 } | 2390 } |
2387 | 2391 |
2388 void RenderViewImpl::didChangeIcon(WebLocalFrame* frame, | 2392 void RenderViewImpl::didChangeIcon(WebLocalFrame* frame, |
2389 WebIconURL::Type icon_type) { | 2393 WebIconURL::Type icon_type) { |
2390 if (frame->parent()) | 2394 if (frame->parent()) |
2391 return; | 2395 return; |
2392 | 2396 |
2393 if (!TouchEnabled() && icon_type != WebIconURL::TypeFavicon) | 2397 if (!TouchEnabled() && icon_type != WebIconURL::TypeFavicon) |
(...skipping 1805 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4199 std::vector<gfx::Size> sizes; | 4203 std::vector<gfx::Size> sizes; |
4200 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4204 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4201 if (!url.isEmpty()) | 4205 if (!url.isEmpty()) |
4202 urls.push_back( | 4206 urls.push_back( |
4203 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4207 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4204 } | 4208 } |
4205 SendUpdateFaviconURL(urls); | 4209 SendUpdateFaviconURL(urls); |
4206 } | 4210 } |
4207 | 4211 |
4208 } // namespace content | 4212 } // namespace content |
OLD | NEW |