Index: components/html_viewer/blink_platform_impl.h |
diff --git a/components/html_viewer/blink_platform_impl.h b/components/html_viewer/blink_platform_impl.h |
index f257a6a4651d06571ee2290e5e9e4f6306eb2433..31760a080ad45a6d3186c04a9424ce50692eb6cf 100644 |
--- a/components/html_viewer/blink_platform_impl.h |
+++ b/components/html_viewer/blink_platform_impl.h |
@@ -14,13 +14,17 @@ |
#include "components/html_viewer/mock_web_blob_registry_impl.h" |
#include "components/html_viewer/web_mime_registry_impl.h" |
#include "components/html_viewer/web_notification_manager_impl.h" |
-#include "components/html_viewer/web_scheduler_impl.h" |
#include "components/html_viewer/web_theme_engine_impl.h" |
#include "components/webcrypto/webcrypto_impl.h" |
#include "mojo/services/network/public/interfaces/network_service.mojom.h" |
#include "third_party/WebKit/public/platform/Platform.h" |
#include "third_party/WebKit/public/platform/WebScrollbarBehavior.h" |
+namespace scheduler { |
+class RendererScheduler; |
+class WebThreadImplForRendererScheduler; |
+} |
+ |
namespace mojo { |
class ApplicationImpl; |
} |
@@ -33,7 +37,8 @@ class WebCookieJarImpl; |
class BlinkPlatformImpl : public blink::Platform { |
public: |
// |app| may be null in tests. |
- explicit BlinkPlatformImpl(mojo::ApplicationImpl* app); |
+ BlinkPlatformImpl(mojo::ApplicationImpl* app, |
+ scheduler::RendererScheduler* renderer_scheduler); |
virtual ~BlinkPlatformImpl(); |
// blink::Platform methods: |
@@ -41,7 +46,6 @@ class BlinkPlatformImpl : public blink::Platform { |
virtual blink::WebClipboard* clipboard(); |
virtual blink::WebMimeRegistry* mimeRegistry(); |
virtual blink::WebThemeEngine* themeEngine(); |
- virtual blink::WebScheduler* scheduler(); |
virtual blink::WebString defaultLocale(); |
virtual blink::WebBlobRegistry* blobRegistry(); |
virtual double currentTime(); |
@@ -83,6 +87,7 @@ class BlinkPlatformImpl : public blink::Platform { |
private: |
void SuspendSharedTimer(); |
void ResumeSharedTimer(); |
+ void UpdateWebThreadTLS(blink::WebThread* thread); |
void DoTimeout() { |
if (shared_timer_func_ && !shared_timer_suspended_) |
@@ -91,6 +96,8 @@ class BlinkPlatformImpl : public blink::Platform { |
static void DestroyCurrentThread(void*); |
+ scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; |
+ scoped_ptr<scheduler::WebThreadImplForRendererScheduler> main_thread_; |
base::OneShotTimer<BlinkPlatformImpl> shared_timer_; |
void (*shared_timer_func_)(); |
double shared_timer_fire_time_; |
@@ -100,7 +107,6 @@ class BlinkPlatformImpl : public blink::Platform { |
cc_blink::WebCompositorSupportImpl compositor_support_; |
WebThemeEngineImpl theme_engine_; |
WebMimeRegistryImpl mime_registry_; |
- WebSchedulerImpl scheduler_; |
webcrypto::WebCryptoImpl web_crypto_; |
WebNotificationManagerImpl web_notification_manager_; |
blink::WebScrollbarBehavior scrollbar_behavior_; |