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

Unified Diff: mojo/services/html_viewer/webthread_impl.h

Issue 1094833002: Mojo changes for moving WebScheduler to WebThread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix it 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | mojo/services/html_viewer/webthread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/webthread_impl.h
diff --git a/mojo/services/html_viewer/webthread_impl.h b/mojo/services/html_viewer/webthread_impl.h
index 1b30ad60ee2945f3f5e4f0bb588c9e0de709a4c9..e7b499d8e2fbcd22cdce16687902ca3a4d217f3f 100644
--- a/mojo/services/html_viewer/webthread_impl.h
+++ b/mojo/services/html_viewer/webthread_impl.h
@@ -9,6 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread.h"
+#include "mojo/services/html_viewer/webscheduler_impl.h"
#include "third_party/WebKit/public/platform/WebThread.h"
namespace html_viewer {
@@ -45,6 +46,8 @@ class WebThreadImpl : public WebThreadBase {
virtual void enterRunLoop();
virtual void exitRunLoop();
+ virtual blink::WebScheduler* scheduler() const;
+
base::MessageLoop* message_loop() const { return thread_->message_loop(); }
bool isCurrentThread() const override;
@@ -52,6 +55,7 @@ class WebThreadImpl : public WebThreadBase {
private:
scoped_ptr<base::Thread> thread_;
+ scoped_ptr<WebSchedulerImpl> web_scheduler_;
};
class WebThreadImplForMessageLoop : public WebThreadBase {
@@ -68,11 +72,14 @@ class WebThreadImplForMessageLoop : public WebThreadBase {
virtual void enterRunLoop();
virtual void exitRunLoop();
+ virtual blink::WebScheduler* scheduler() const;
+
private:
bool isCurrentThread() const override;
virtual blink::PlatformThreadId threadId() const;
scoped_refptr<base::MessageLoopProxy> message_loop_;
+ scoped_ptr<WebSchedulerImpl> web_scheduler_;
blink::PlatformThreadId thread_id_;
};
« no previous file with comments | « no previous file | mojo/services/html_viewer/webthread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698