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

Unified Diff: cc/trees/single_thread_proxy.h

Issue 619843002: cc: Make separate interface for BeginFrame ipc from OutputSurface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
Index: cc/trees/single_thread_proxy.h
diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
index 030f1ca9b708698e0dd6b7af07fa65fd9b2ff69e..2f3510e1bb6022f0040198caa0ded8c7a78ea569 100644
--- a/cc/trees/single_thread_proxy.h
+++ b/cc/trees/single_thread_proxy.h
@@ -19,6 +19,7 @@
namespace cc {
class ContextProvider;
+class ExternalBeginFrameSource;
class LayerTreeHost;
class LayerTreeHostSingleThreadClient;
@@ -29,7 +30,8 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
static scoped_ptr<Proxy> Create(
LayerTreeHost* layer_tree_host,
LayerTreeHostSingleThreadClient* client,
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
+ scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
+ scoped_ptr<ExternalBeginFrameSource> external_begin_frame_source);
virtual ~SingleThreadProxy();
// Proxy implementation
@@ -58,7 +60,6 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
virtual bool MainFrameWillHappenForTesting() override;
// SchedulerClient implementation
- virtual BeginFrameSource* ExternalBeginFrameSource() override;
virtual void WillBeginImplFrame(const BeginFrameArgs& args) override;
virtual void ScheduledActionSendBeginMainFrame() override;
virtual DrawResult ScheduledActionDrawAndSwapIfPossible() override;
@@ -116,7 +117,8 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
SingleThreadProxy(
LayerTreeHost* layer_tree_host,
LayerTreeHostSingleThreadClient* client,
- scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
+ scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
+ scoped_ptr<ExternalBeginFrameSource> external_begin_frame_source);
void BeginMainFrame();
void BeginMainFrameAbortedOnImplThread();
@@ -153,6 +155,8 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
bool commit_was_deferred_;
bool commit_requested_;
+ scoped_ptr<ExternalBeginFrameSource> external_begin_frame_source_;
+
base::WeakPtrFactory<SingleThreadProxy> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(SingleThreadProxy);

Powered by Google App Engine
This is Rietveld 408576698