diff options
| author | alexclarke <alexclarke@chromium.org> | 2015-04-20 03:16:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-20 10:16:15 +0000 |
| commit | ed162fc872a8fe93811edbcd6b2f452656e2a6cd (patch) | |
| tree | b153821896ddbf00d942d6a5749e2e883f44dffc /content/renderer | |
| parent | bbdd2f0e44081940d1c4111676267e1ac6b654cf (diff) | |
| download | chromium_src-ed162fc872a8fe93811edbcd6b2f452656e2a6cd.zip chromium_src-ed162fc872a8fe93811edbcd6b2f452656e2a6cd.tar.gz chromium_src-ed162fc872a8fe93811edbcd6b2f452656e2a6cd.tar.bz2 | |
Patch 3/3 to get WebScheduler via WebThread
Now that all blink threads have schedulers it makes sense to get
hold the corresponding WebScheduler via WebThread. This patch
removes the old Platform::scheduler() support in chromium.
Patch 1: https://codereview.chromium.org/1088053003
Patch 2: https://codereview.chromium.org/1087203002
BUG=463143
Review URL: https://codereview.chromium.org/1084173002
Cr-Commit-Position: refs/heads/master@{#325824}
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/renderer_blink_platform_impl.cc | 9 | ||||
| -rw-r--r-- | content/renderer/renderer_blink_platform_impl.h | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc index f8ee03c..e42a1a0 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc @@ -223,11 +223,6 @@ class RendererBlinkPlatformImpl::SandboxSupport RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( RendererScheduler* renderer_scheduler) : BlinkPlatformImpl(renderer_scheduler->DefaultTaskRunner()), - web_scheduler_( - new WebSchedulerImpl(renderer_scheduler, - renderer_scheduler->IdleTaskRunner(), - renderer_scheduler->LoadingTaskRunner(), - renderer_scheduler->TimerTaskRunner())), main_thread_(new WebThreadImplForRendererScheduler(renderer_scheduler)), clipboard_delegate_(new RendererClipboardDelegate), clipboard_(new WebClipboardImpl(clipboard_delegate_.get())), @@ -262,10 +257,6 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl() { //------------------------------------------------------------------------------ -blink::WebScheduler* RendererBlinkPlatformImpl::scheduler() { - return web_scheduler_.get(); -} - blink::WebThread* RendererBlinkPlatformImpl::currentThread() { if (main_thread_->isCurrentThread()) return main_thread_.get(); diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h index 4b43470..da3ec90 100644 --- a/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h @@ -35,7 +35,6 @@ class WebDeviceMotionData; class WebDeviceOrientationData; class WebGraphicsContext3DProvider; class WebServiceWorkerCacheStorage; -class WebScheduler; } namespace content { @@ -52,7 +51,6 @@ class ThreadSafeSender; class WebClipboardImpl; class WebDatabaseObserverImpl; class WebFileSystemImpl; -class WebSchedulerImpl; class WebThreadImplForRendererScheduler; class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -158,7 +156,6 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { blink::WebStorageQuotaCallbacks); virtual void vibrate(unsigned int milliseconds); virtual void cancelVibration(); - virtual blink::WebScheduler* scheduler(); virtual blink::WebThread* currentThread(); virtual void recordRappor(const char* metric, const blink::WebString& sample); virtual void recordRapporURL(const char* metric, const blink::WebURL& url); @@ -211,7 +208,6 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { void SendFakeDeviceEventDataForTesting(blink::WebPlatformEventType type); device::VibrationManagerPtr& GetConnectedVibrationManagerService(); - scoped_ptr<WebSchedulerImpl> web_scheduler_; scoped_ptr<WebThreadImplForRendererScheduler> main_thread_; scoped_ptr<RendererClipboardDelegate> clipboard_delegate_; |