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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
89 #include "content/renderer/memory_benchmarking_extension.h" | 89 #include "content/renderer/memory_benchmarking_extension.h" |
90 #include "content/renderer/mhtml_generator.h" | 90 #include "content/renderer/mhtml_generator.h" |
91 #include "content/renderer/net_info_helper.h" | 91 #include "content/renderer/net_info_helper.h" |
92 #include "content/renderer/render_frame_impl.h" | 92 #include "content/renderer/render_frame_impl.h" |
93 #include "content/renderer/render_frame_proxy.h" | 93 #include "content/renderer/render_frame_proxy.h" |
94 #include "content/renderer/render_process.h" | 94 #include "content/renderer/render_process.h" |
95 #include "content/renderer/render_thread_impl.h" | 95 #include "content/renderer/render_thread_impl.h" |
96 #include "content/renderer/render_view_impl_params.h" | 96 #include "content/renderer/render_view_impl_params.h" |
97 #include "content/renderer/render_view_mouse_lock_dispatcher.h" | 97 #include "content/renderer/render_view_mouse_lock_dispatcher.h" |
98 #include "content/renderer/render_widget_fullscreen_pepper.h" | 98 #include "content/renderer/render_widget_fullscreen_pepper.h" |
99 #include "content/renderer/renderer_blink_platform_impl.h" | |
99 #include "content/renderer/renderer_webapplicationcachehost_impl.h" | 100 #include "content/renderer/renderer_webapplicationcachehost_impl.h" |
100 #include "content/renderer/resizing_mode_selector.h" | 101 #include "content/renderer/resizing_mode_selector.h" |
101 #include "content/renderer/savable_resources.h" | 102 #include "content/renderer/savable_resources.h" |
102 #include "content/renderer/skia_benchmarking_extension.h" | 103 #include "content/renderer/skia_benchmarking_extension.h" |
103 #include "content/renderer/speech_recognition_dispatcher.h" | 104 #include "content/renderer/speech_recognition_dispatcher.h" |
104 #include "content/renderer/stats_collection_controller.h" | 105 #include "content/renderer/stats_collection_controller.h" |
105 #include "content/renderer/stats_collection_observer.h" | 106 #include "content/renderer/stats_collection_observer.h" |
106 #include "content/renderer/text_input_client_observer.h" | 107 #include "content/renderer/text_input_client_observer.h" |
107 #include "content/renderer/v8_value_converter_impl.h" | 108 #include "content/renderer/v8_value_converter_impl.h" |
108 #include "content/renderer/web_ui_extension.h" | 109 #include "content/renderer/web_ui_extension.h" |
(...skipping 2029 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2138 use_threaded_event_handling = CommandLine::ForCurrentProcess()->HasSwitch( | 2139 use_threaded_event_handling = CommandLine::ForCurrentProcess()->HasSwitch( |
2139 switches::kEnableThreadedEventHandlingMac); | 2140 switches::kEnableThreadedEventHandlingMac); |
2140 #endif | 2141 #endif |
2141 if (use_threaded_event_handling) { | 2142 if (use_threaded_event_handling) { |
2142 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 2143 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
2143 // render_thread may be NULL in tests. | 2144 // render_thread may be NULL in tests. |
2144 InputHandlerManager* input_handler_manager = | 2145 InputHandlerManager* input_handler_manager = |
2145 render_thread ? render_thread->input_handler_manager() : NULL; | 2146 render_thread ? render_thread->input_handler_manager() : NULL; |
2146 if (input_handler_manager) { | 2147 if (input_handler_manager) { |
2147 input_handler_manager->AddInputHandler( | 2148 input_handler_manager->AddInputHandler( |
2148 routing_id_, rwc->GetInputHandler(), AsWeakPtr()); | 2149 routing_id_, rwc->GetInputHandler(), AsWeakPtr(), |
2150 render_thread->blink_platform_impl()->renderer_scheduler()); | |
rmcilroy
2014/11/06 00:53:16
You need to rebase - renderer_scheduler() is now o
alex clarke (OOO till 29th)
2014/11/06 19:21:45
Done.
| |
2149 } | 2151 } |
2150 } | 2152 } |
2151 } | 2153 } |
2152 | 2154 |
2153 // blink::WebFrameClient ----------------------------------------------------- | 2155 // blink::WebFrameClient ----------------------------------------------------- |
2154 | 2156 |
2155 void RenderViewImpl::Repaint(const gfx::Size& size) { | 2157 void RenderViewImpl::Repaint(const gfx::Size& size) { |
2156 OnRepaint(size); | 2158 OnRepaint(size); |
2157 } | 2159 } |
2158 | 2160 |
(...skipping 2058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4217 std::vector<gfx::Size> sizes; | 4219 std::vector<gfx::Size> sizes; |
4218 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4220 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4219 if (!url.isEmpty()) | 4221 if (!url.isEmpty()) |
4220 urls.push_back( | 4222 urls.push_back( |
4221 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4223 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4222 } | 4224 } |
4223 SendUpdateFaviconURL(urls); | 4225 SendUpdateFaviconURL(urls); |
4224 } | 4226 } |
4225 | 4227 |
4226 } // namespace content | 4228 } // namespace content |
OLD | NEW |