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

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

Issue 930063002: Revert of scheduler: Implement task observers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "content/renderer/device_sensors/device_orientation_event_pump.h" 45 #include "content/renderer/device_sensors/device_orientation_event_pump.h"
46 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 46 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
47 #include "content/renderer/gamepad_shared_memory_reader.h" 47 #include "content/renderer/gamepad_shared_memory_reader.h"
48 #include "content/renderer/media/audio_decoder.h" 48 #include "content/renderer/media/audio_decoder.h"
49 #include "content/renderer/media/renderer_webaudiodevice_impl.h" 49 #include "content/renderer/media/renderer_webaudiodevice_impl.h"
50 #include "content/renderer/media/renderer_webmidiaccessor_impl.h" 50 #include "content/renderer/media/renderer_webmidiaccessor_impl.h"
51 #include "content/renderer/render_thread_impl.h" 51 #include "content/renderer/render_thread_impl.h"
52 #include "content/renderer/renderer_clipboard_delegate.h" 52 #include "content/renderer/renderer_clipboard_delegate.h"
53 #include "content/renderer/scheduler/renderer_scheduler.h" 53 #include "content/renderer/scheduler/renderer_scheduler.h"
54 #include "content/renderer/scheduler/web_scheduler_impl.h" 54 #include "content/renderer/scheduler/web_scheduler_impl.h"
55 #include "content/renderer/scheduler/webthread_impl_for_scheduler.h"
56 #include "content/renderer/screen_orientation/screen_orientation_observer.h" 55 #include "content/renderer/screen_orientation/screen_orientation_observer.h"
57 #include "content/renderer/webclipboard_impl.h" 56 #include "content/renderer/webclipboard_impl.h"
58 #include "content/renderer/webgraphicscontext3d_provider_impl.h" 57 #include "content/renderer/webgraphicscontext3d_provider_impl.h"
59 #include "content/renderer/webpublicsuffixlist_impl.h" 58 #include "content/renderer/webpublicsuffixlist_impl.h"
60 #include "gpu/config/gpu_info.h" 59 #include "gpu/config/gpu_info.h"
61 #include "ipc/ipc_sync_message_filter.h" 60 #include "ipc/ipc_sync_message_filter.h"
62 #include "media/audio/audio_output_device.h" 61 #include "media/audio/audio_output_device.h"
63 #include "media/base/audio_hardware_config.h" 62 #include "media/base/audio_hardware_config.h"
64 #include "media/base/key_systems.h" 63 #include "media/base/key_systems.h"
65 #include "media/blink/webcontentdecryptionmodule_impl.h" 64 #include "media/blink/webcontentdecryptionmodule_impl.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 #endif 221 #endif
223 }; 222 };
224 #endif // defined(OS_ANDROID) 223 #endif // defined(OS_ANDROID)
225 224
226 //------------------------------------------------------------------------------ 225 //------------------------------------------------------------------------------
227 226
228 RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( 227 RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
229 RendererScheduler* renderer_scheduler) 228 RendererScheduler* renderer_scheduler)
230 : BlinkPlatformImpl(renderer_scheduler->DefaultTaskRunner()), 229 : BlinkPlatformImpl(renderer_scheduler->DefaultTaskRunner()),
231 web_scheduler_(new WebSchedulerImpl(renderer_scheduler)), 230 web_scheduler_(new WebSchedulerImpl(renderer_scheduler)),
232 main_thread_(new WebThreadImplForScheduler(renderer_scheduler)),
233 clipboard_delegate_(new RendererClipboardDelegate), 231 clipboard_delegate_(new RendererClipboardDelegate),
234 clipboard_(new WebClipboardImpl(clipboard_delegate_.get())), 232 clipboard_(new WebClipboardImpl(clipboard_delegate_.get())),
235 mime_registry_(new RendererBlinkPlatformImpl::MimeRegistry), 233 mime_registry_(new RendererBlinkPlatformImpl::MimeRegistry),
236 sudden_termination_disables_(0), 234 sudden_termination_disables_(0),
237 plugin_refresh_allowed_(true), 235 plugin_refresh_allowed_(true),
238 default_task_runner_(renderer_scheduler->DefaultTaskRunner()), 236 default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
239 web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) { 237 web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) {
240 if (g_sandbox_enabled && sandboxEnabled()) { 238 if (g_sandbox_enabled && sandboxEnabled()) {
241 sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); 239 sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
242 } else { 240 } else {
(...skipping 15 matching lines...) Expand all
258 RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() { 256 RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() {
259 WebFileSystemImpl::DeleteThreadSpecificInstance(); 257 WebFileSystemImpl::DeleteThreadSpecificInstance();
260 } 258 }
261 259
262 //------------------------------------------------------------------------------ 260 //------------------------------------------------------------------------------
263 261
264 blink::WebScheduler* RendererBlinkPlatformImpl::scheduler() { 262 blink::WebScheduler* RendererBlinkPlatformImpl::scheduler() {
265 return web_scheduler_.get(); 263 return web_scheduler_.get();
266 } 264 }
267 265
268 blink::WebThread* RendererBlinkPlatformImpl::currentThread() {
269 if (main_thread_->isCurrentThread())
270 return main_thread_.get();
271 return BlinkPlatformImpl::currentThread();
272 }
273
274 blink::WebClipboard* RendererBlinkPlatformImpl::clipboard() { 266 blink::WebClipboard* RendererBlinkPlatformImpl::clipboard() {
275 blink::WebClipboard* clipboard = 267 blink::WebClipboard* clipboard =
276 GetContentClient()->renderer()->OverrideWebClipboard(); 268 GetContentClient()->renderer()->OverrideWebClipboard();
277 if (clipboard) 269 if (clipboard)
278 return clipboard; 270 return clipboard;
279 return clipboard_.get(); 271 return clipboard_.get();
280 } 272 }
281 273
282 blink::WebMimeRegistry* RendererBlinkPlatformImpl::mimeRegistry() { 274 blink::WebMimeRegistry* RendererBlinkPlatformImpl::mimeRegistry() {
283 return mime_registry_.get(); 275 return mime_registry_.get();
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 //------------------------------------------------------------------------------ 1213 //------------------------------------------------------------------------------
1222 1214
1223 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( 1215 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting(
1224 const blink::WebBatteryStatus& status) { 1216 const blink::WebBatteryStatus& status) {
1225 if (!g_test_battery_status_listener) 1217 if (!g_test_battery_status_listener)
1226 return; 1218 return;
1227 g_test_battery_status_listener->updateBatteryStatus(status); 1219 g_test_battery_status_listener->updateBatteryStatus(status);
1228 } 1220 }
1229 1221
1230 } // namespace content 1222 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.h ('k') | content/renderer/scheduler/null_renderer_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698