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

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

Issue 664963002: content: Add RendererScheduler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Daniel and Jared's comments and move renderer_scheduler ownership to render_thread_impl Created 6 years, 1 month 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
OLDNEW
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/renderer_blink_platform_impl.h" 5 #include "content/renderer/renderer_blink_platform_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "content/renderer/device_sensors/device_orientation_event_pump.h" 43 #include "content/renderer/device_sensors/device_orientation_event_pump.h"
44 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 44 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
45 #include "content/renderer/gamepad_shared_memory_reader.h" 45 #include "content/renderer/gamepad_shared_memory_reader.h"
46 #include "content/renderer/media/audio_decoder.h" 46 #include "content/renderer/media/audio_decoder.h"
47 #include "content/renderer/media/crypto/key_systems.h" 47 #include "content/renderer/media/crypto/key_systems.h"
48 #include "content/renderer/media/renderer_webaudiodevice_impl.h" 48 #include "content/renderer/media/renderer_webaudiodevice_impl.h"
49 #include "content/renderer/media/renderer_webmidiaccessor_impl.h" 49 #include "content/renderer/media/renderer_webmidiaccessor_impl.h"
50 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" 50 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
51 #include "content/renderer/render_thread_impl.h" 51 #include "content/renderer/render_thread_impl.h"
52 #include "content/renderer/renderer_clipboard_client.h" 52 #include "content/renderer/renderer_clipboard_client.h"
53 #include "content/renderer/scheduler/renderer_scheduler.h"
54 #include "content/renderer/scheduler/web_scheduler_impl.h"
53 #include "content/renderer/screen_orientation/screen_orientation_observer.h" 55 #include "content/renderer/screen_orientation/screen_orientation_observer.h"
54 #include "content/renderer/webclipboard_impl.h" 56 #include "content/renderer/webclipboard_impl.h"
55 #include "content/renderer/webgraphicscontext3d_provider_impl.h" 57 #include "content/renderer/webgraphicscontext3d_provider_impl.h"
56 #include "content/renderer/webpublicsuffixlist_impl.h" 58 #include "content/renderer/webpublicsuffixlist_impl.h"
57 #include "gpu/config/gpu_info.h" 59 #include "gpu/config/gpu_info.h"
58 #include "ipc/ipc_sync_message_filter.h" 60 #include "ipc/ipc_sync_message_filter.h"
59 #include "media/audio/audio_output_device.h" 61 #include "media/audio/audio_output_device.h"
60 #include "media/base/audio_hardware_config.h" 62 #include "media/base/audio_hardware_config.h"
61 #include "media/filters/stream_parser_factory.h" 63 #include "media/filters/stream_parser_factory.h"
62 #include "net/base/mime_util.h" 64 #include "net/base/mime_util.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // unicode code points. It needs this information frequently so we cache it 219 // unicode code points. It needs this information frequently so we cache it
218 // here. 220 // here.
219 base::Lock unicode_font_families_mutex_; 221 base::Lock unicode_font_families_mutex_;
220 std::map<int32_t, blink::WebFallbackFont> unicode_font_families_; 222 std::map<int32_t, blink::WebFallbackFont> unicode_font_families_;
221 #endif 223 #endif
222 }; 224 };
223 #endif // defined(OS_ANDROID) 225 #endif // defined(OS_ANDROID)
224 226
225 //------------------------------------------------------------------------------ 227 //------------------------------------------------------------------------------
226 228
227 RendererBlinkPlatformImpl::RendererBlinkPlatformImpl() 229 RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
228 : clipboard_client_(new RendererClipboardClient), 230 RendererScheduler* renderer_scheduler)
231 : web_scheduler_(new WebSchedulerImpl(renderer_scheduler)),
232 clipboard_client_(new RendererClipboardClient),
229 clipboard_(new WebClipboardImpl(clipboard_client_.get())), 233 clipboard_(new WebClipboardImpl(clipboard_client_.get())),
230 mime_registry_(new RendererBlinkPlatformImpl::MimeRegistry), 234 mime_registry_(new RendererBlinkPlatformImpl::MimeRegistry),
231 sudden_termination_disables_(0), 235 sudden_termination_disables_(0),
232 plugin_refresh_allowed_(true), 236 plugin_refresh_allowed_(true),
237 default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
233 child_thread_loop_(base::MessageLoopProxy::current()), 238 child_thread_loop_(base::MessageLoopProxy::current()),
234 web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) { 239 web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) {
235 if (g_sandbox_enabled && sandboxEnabled()) { 240 if (g_sandbox_enabled && sandboxEnabled()) {
236 sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); 241 sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
237 } else { 242 } else {
238 DVLOG(1) << "Disabling sandbox support for testing."; 243 DVLOG(1) << "Disabling sandbox support for testing.";
239 } 244 }
240 245
241 // ChildThread may not exist in some tests. 246 // ChildThread may not exist in some tests.
242 if (ChildThread::current()) { 247 if (ChildThread::current()) {
243 sync_message_filter_ = ChildThread::current()->sync_message_filter(); 248 sync_message_filter_ = ChildThread::current()->sync_message_filter();
244 thread_safe_sender_ = ChildThread::current()->thread_safe_sender(); 249 thread_safe_sender_ = ChildThread::current()->thread_safe_sender();
245 quota_message_filter_ = ChildThread::current()->quota_message_filter(); 250 quota_message_filter_ = ChildThread::current()->quota_message_filter();
246 blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); 251 blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
247 web_idb_factory_.reset(new WebIDBFactoryImpl(thread_safe_sender_.get())); 252 web_idb_factory_.reset(new WebIDBFactoryImpl(thread_safe_sender_.get()));
248 web_database_observer_impl_.reset( 253 web_database_observer_impl_.reset(
249 new WebDatabaseObserverImpl(sync_message_filter_.get())); 254 new WebDatabaseObserverImpl(sync_message_filter_.get()));
250 } 255 }
251 } 256 }
252 257
253 RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() { 258 RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() {
254 WebFileSystemImpl::DeleteThreadSpecificInstance(); 259 WebFileSystemImpl::DeleteThreadSpecificInstance();
255 } 260 }
256 261
257 //------------------------------------------------------------------------------ 262 //------------------------------------------------------------------------------
258 263
264 void RendererBlinkPlatformImpl::callOnMainThread(void (*func)(void*),
265 void* context) {
266 default_task_runner_->PostTask(FROM_HERE, base::Bind(func, context));
267 }
268
269 blink::WebScheduler* RendererBlinkPlatformImpl::scheduler() {
270 return web_scheduler_.get();
271 }
272
259 blink::WebClipboard* RendererBlinkPlatformImpl::clipboard() { 273 blink::WebClipboard* RendererBlinkPlatformImpl::clipboard() {
260 blink::WebClipboard* clipboard = 274 blink::WebClipboard* clipboard =
261 GetContentClient()->renderer()->OverrideWebClipboard(); 275 GetContentClient()->renderer()->OverrideWebClipboard();
262 if (clipboard) 276 if (clipboard)
263 return clipboard; 277 return clipboard;
264 return clipboard_.get(); 278 return clipboard_.get();
265 } 279 }
266 280
267 blink::WebMimeRegistry* RendererBlinkPlatformImpl::mimeRegistry() { 281 blink::WebMimeRegistry* RendererBlinkPlatformImpl::mimeRegistry() {
268 return mime_registry_.get(); 282 return mime_registry_.get();
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 //------------------------------------------------------------------------------ 1216 //------------------------------------------------------------------------------
1203 1217
1204 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( 1218 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting(
1205 const blink::WebBatteryStatus& status) { 1219 const blink::WebBatteryStatus& status) {
1206 if (!g_test_battery_status_listener) 1220 if (!g_test_battery_status_listener)
1207 return; 1221 return;
1208 g_test_battery_status_listener->updateBatteryStatus(status); 1222 g_test_battery_status_listener->updateBatteryStatus(status);
1209 } 1223 }
1210 1224
1211 } // namespace content 1225 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698