Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / cc / trees / single_thread_proxy.h

diff --git a/src/cc/trees/single_thread_proxy.h b/src/cc/trees/single_thread_proxy.h
index 7ad48b4..685b11a 100644 (file)
--- a/src/cc/trees/single_thread_proxy.h
+++ b/src/cc/trees/single_thread_proxy.h
@@ -20,11 +20,12 @@ class LayerTreeHost;
 class LayerTreeHostSingleThreadClient;
 
 class CC_EXPORT SingleThreadProxy : public Proxy,
-                    NON_EXPORTED_BASE(LayerTreeHostImplClient) {
+                                    NON_EXPORTED_BASE(LayerTreeHostImplClient) {
  public:
   static scoped_ptr<Proxy> Create(
       LayerTreeHost* layer_tree_host,
-      LayerTreeHostSingleThreadClient* client);
+      LayerTreeHostSingleThreadClient* client,
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
   virtual ~SingleThreadProxy();
 
   // Proxy implementation
@@ -47,8 +48,9 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
   virtual void Stop() OVERRIDE;
   virtual size_t MaxPartialTextureUpdates() const OVERRIDE;
   virtual void ForceSerializeOnSwapBuffers() OVERRIDE;
-  virtual scoped_ptr<base::Value> AsValue() const OVERRIDE;
-  virtual bool CommitPendingForTesting() OVERRIDE;
+  virtual bool SupportsImplScrolling() const OVERRIDE;
+  virtual void AsValueInto(base::debug::TracedValue* state) const OVERRIDE;
+  virtual bool MainFrameWillHappenForTesting() OVERRIDE;
 
   // LayerTreeHostImplClient implementation
   virtual void UpdateRendererCapabilitiesOnImplThread() OVERRIDE;
@@ -79,7 +81,7 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
   virtual void PostDelayedScrollbarFadeOnImplThread(
       const base::Closure& start_fade,
       base::TimeDelta delay) OVERRIDE {}
-  virtual void DidActivatePendingTree() OVERRIDE {}
+  virtual void DidActivateSyncTree() OVERRIDE {}
   virtual void DidManageTiles() OVERRIDE {}
   virtual void SetDebugState(const LayerTreeDebugState& debug_state) OVERRIDE {}
 
@@ -91,8 +93,10 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
   void CompositeImmediately(base::TimeTicks frame_begin_time);
 
  private:
-  SingleThreadProxy(LayerTreeHost* layer_tree_host,
-                    LayerTreeHostSingleThreadClient* client);
+  SingleThreadProxy(
+      LayerTreeHost* layer_tree_host,
+      LayerTreeHostSingleThreadClient* client,
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
 
   void DoCommit(scoped_ptr<ResourceUpdateQueue> queue);
   bool DoComposite(base::TimeTicks frame_begin_time,