diff options
| author | alexclarke <alexclarke@chromium.org> | 2015-12-11 05:23:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-11 13:25:31 +0000 |
| commit | f11baf32d47858ede5bb8a5546388d1b501a10e3 (patch) | |
| tree | 372e87f4efc6a4a22ce73f00edf7a0399bc0b073 /content/ppapi_plugin | |
| parent | 59b0ca75abf98c9255a85d1f9e3fbe85e272272b (diff) | |
| download | chromium_src-f11baf32d47858ede5bb8a5546388d1b501a10e3.zip chromium_src-f11baf32d47858ede5bb8a5546388d1b501a10e3.tar.gz chromium_src-f11baf32d47858ede5bb8a5546388d1b501a10e3.tar.bz2 | |
Remove the scheduler from the PPAPI thread
The scheduler is designed to be the only thing talking to the underlying
base messageloop. We arguably don't need it on the PPAPI thread so this
patch removes it and fixes the origional bug that prompted its use in a
different way.
BUG=558825, 534972
Review URL: https://codereview.chromium.org/1511893003
Cr-Commit-Position: refs/heads/master@{#364688}
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/DEPS | 1 | ||||
| -rw-r--r-- | content/ppapi_plugin/ppapi_blink_platform_impl.cc | 6 | ||||
| -rw-r--r-- | content/ppapi_plugin/ppapi_blink_platform_impl.h | 5 |
3 files changed, 1 insertions, 11 deletions
diff --git a/content/ppapi_plugin/DEPS b/content/ppapi_plugin/DEPS index 903662b..bde9e92 100644 --- a/content/ppapi_plugin/DEPS +++ b/content/ppapi_plugin/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+components/scheduler/ppapi", "+content/child", "+content/public/plugin", "+ppapi/c", diff --git a/content/ppapi_plugin/ppapi_blink_platform_impl.cc b/content/ppapi_plugin/ppapi_blink_platform_impl.cc index de977b2..1bd093e 100644 --- a/content/ppapi_plugin/ppapi_blink_platform_impl.cc +++ b/content/ppapi_plugin/ppapi_blink_platform_impl.cc @@ -10,7 +10,6 @@ #include "base/strings/string16.h" #include "base/threading/platform_thread.h" #include "build/build_config.h" -#include "components/scheduler/ppapi/webthread_impl_for_ppapi.h" #include "content/child/child_thread_impl.h" #include "content/common/child_process_messages.h" #include "ppapi/proxy/plugin_globals.h" @@ -115,8 +114,7 @@ void PpapiBlinkPlatformImpl::SandboxSupport::getRenderStyleForStrike( #endif // !defined(OS_ANDROID) && !defined(OS_WIN) -PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() - : main_thread_(new scheduler::WebThreadImplForPPAPI()) { +PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { #if !defined(OS_ANDROID) && !defined(OS_WIN) sandbox_support_.reset(new PpapiBlinkPlatformImpl::SandboxSupport); #endif @@ -135,8 +133,6 @@ void PpapiBlinkPlatformImpl::Shutdown() { } blink::WebThread* PpapiBlinkPlatformImpl::currentThread() { - if (main_thread_->isCurrentThread()) - return main_thread_.get(); return BlinkPlatformImpl::currentThread(); } diff --git a/content/ppapi_plugin/ppapi_blink_platform_impl.h b/content/ppapi_plugin/ppapi_blink_platform_impl.h index 7102c9b..df17836 100644 --- a/content/ppapi_plugin/ppapi_blink_platform_impl.h +++ b/content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -9,10 +9,6 @@ #include "base/memory/scoped_ptr.h" #include "content/child/blink_platform_impl.h" -namespace scheduler { -class WebThreadImplForPPAPI; -} - namespace content { class PpapiBlinkPlatformImpl : public BlinkPlatformImpl { @@ -59,7 +55,6 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImpl { class SandboxSupport; scoped_ptr<SandboxSupport> sandbox_support_; #endif - scoped_ptr<scheduler::WebThreadImplForPPAPI> main_thread_; DISALLOW_COPY_AND_ASSIGN(PpapiBlinkPlatformImpl); }; |