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

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

Issue 1084173002: Patch 3/3 to get WebScheduler via WebThread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 8 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 std::map<int32_t, blink::WebFallbackFont> unicode_font_families_; 216 std::map<int32_t, blink::WebFallbackFont> unicode_font_families_;
217 #endif 217 #endif
218 }; 218 };
219 #endif // !defined(OS_ANDROID) && !defined(OS_WIN) 219 #endif // !defined(OS_ANDROID) && !defined(OS_WIN)
220 220
221 //------------------------------------------------------------------------------ 221 //------------------------------------------------------------------------------
222 222
223 RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( 223 RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
224 RendererScheduler* renderer_scheduler) 224 RendererScheduler* renderer_scheduler)
225 : BlinkPlatformImpl(renderer_scheduler->DefaultTaskRunner()), 225 : BlinkPlatformImpl(renderer_scheduler->DefaultTaskRunner()),
226 web_scheduler_(
227 new WebSchedulerImpl(renderer_scheduler,
228 renderer_scheduler->IdleTaskRunner(),
229 renderer_scheduler->LoadingTaskRunner(),
230 renderer_scheduler->TimerTaskRunner())),
231 main_thread_(new WebThreadImplForRendererScheduler(renderer_scheduler)), 226 main_thread_(new WebThreadImplForRendererScheduler(renderer_scheduler)),
232 clipboard_delegate_(new RendererClipboardDelegate), 227 clipboard_delegate_(new RendererClipboardDelegate),
233 clipboard_(new WebClipboardImpl(clipboard_delegate_.get())), 228 clipboard_(new WebClipboardImpl(clipboard_delegate_.get())),
234 mime_registry_(new RendererBlinkPlatformImpl::MimeRegistry), 229 mime_registry_(new RendererBlinkPlatformImpl::MimeRegistry),
235 sudden_termination_disables_(0), 230 sudden_termination_disables_(0),
236 plugin_refresh_allowed_(true), 231 plugin_refresh_allowed_(true),
237 default_task_runner_(renderer_scheduler->DefaultTaskRunner()), 232 default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
238 web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) { 233 web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) {
239 #if !defined(OS_ANDROID) && !defined(OS_WIN) 234 #if !defined(OS_ANDROID) && !defined(OS_WIN)
240 if (g_sandbox_enabled && sandboxEnabled()) { 235 if (g_sandbox_enabled && sandboxEnabled()) {
(...skipping 14 matching lines...) Expand all
255 new WebDatabaseObserverImpl(sync_message_filter_.get())); 250 new WebDatabaseObserverImpl(sync_message_filter_.get()));
256 } 251 }
257 } 252 }
258 253
259 RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() { 254 RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() {
260 WebFileSystemImpl::DeleteThreadSpecificInstance(); 255 WebFileSystemImpl::DeleteThreadSpecificInstance();
261 } 256 }
262 257
263 //------------------------------------------------------------------------------ 258 //------------------------------------------------------------------------------
264 259
265 blink::WebScheduler* RendererBlinkPlatformImpl::scheduler() {
266 return web_scheduler_.get();
267 }
268
269 blink::WebThread* RendererBlinkPlatformImpl::currentThread() { 260 blink::WebThread* RendererBlinkPlatformImpl::currentThread() {
270 if (main_thread_->isCurrentThread()) 261 if (main_thread_->isCurrentThread())
271 return main_thread_.get(); 262 return main_thread_.get();
272 return BlinkPlatformImpl::currentThread(); 263 return BlinkPlatformImpl::currentThread();
273 } 264 }
274 265
275 blink::WebClipboard* RendererBlinkPlatformImpl::clipboard() { 266 blink::WebClipboard* RendererBlinkPlatformImpl::clipboard() {
276 blink::WebClipboard* clipboard = 267 blink::WebClipboard* clipboard =
277 GetContentClient()->renderer()->OverrideWebClipboard(); 268 GetContentClient()->renderer()->OverrideWebClipboard();
278 if (clipboard) 269 if (clipboard)
(...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after
1235 //------------------------------------------------------------------------------ 1226 //------------------------------------------------------------------------------
1236 1227
1237 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( 1228 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting(
1238 const blink::WebBatteryStatus& status) { 1229 const blink::WebBatteryStatus& status) {
1239 if (!g_test_battery_status_listener) 1230 if (!g_test_battery_status_listener)
1240 return; 1231 return;
1241 g_test_battery_status_listener->updateBatteryStatus(status); 1232 g_test_battery_status_listener->updateBatteryStatus(status);
1242 } 1233 }
1243 1234
1244 } // namespace content 1235 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.h ('k') | content/test/test_blink_web_unit_test_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698