Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / cc / test / fake_proxy.h

diff --git a/src/cc/test/fake_proxy.h b/src/cc/test/fake_proxy.h
index cda4e72..27cd72c 100644 (file)
--- a/src/cc/test/fake_proxy.h
+++ b/src/cc/test/fake_proxy.h
@@ -13,21 +13,18 @@ namespace cc {
 
 class FakeProxy : public Proxy {
  public:
-  FakeProxy() : Proxy(NULL), layer_tree_host_(NULL) {}
+  FakeProxy() : Proxy(NULL, NULL), layer_tree_host_(NULL) {}
   explicit FakeProxy(
+      scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner)
-      : Proxy(impl_task_runner),
-        layer_tree_host_(NULL) {}
+      : Proxy(main_task_runner, impl_task_runner), layer_tree_host_(NULL) {}
 
   void SetLayerTreeHost(LayerTreeHost* host);
 
-  virtual bool CompositeAndReadback(void* pixels,
-                                    const gfx::Rect& rect) OVERRIDE;
   virtual void FinishAllRendering() OVERRIDE {}
   virtual bool IsStarted() const OVERRIDE;
   virtual void SetLayerTreeHostClientReady() OVERRIDE {}
   virtual void SetVisible(bool visible) OVERRIDE {}
-  virtual void CreateAndInitializeOutputSurface() OVERRIDE;
   virtual const RendererCapabilities& GetRendererCapabilities() const OVERRIDE;
   virtual void SetNeedsAnimate() OVERRIDE {}
   virtual void SetNeedsUpdateLayers() OVERRIDE {}
@@ -43,9 +40,10 @@ class FakeProxy : public Proxy {
   virtual void Stop() OVERRIDE {}
   virtual void ForceSerializeOnSwapBuffers() OVERRIDE {}
   virtual size_t MaxPartialTextureUpdates() const OVERRIDE;
-  virtual void AcquireLayerTextures() OVERRIDE {}
-  virtual bool CommitPendingForTesting() OVERRIDE;
-  virtual scoped_ptr<base::Value> AsValue() const OVERRIDE;
+  virtual bool SupportsImplScrolling() const OVERRIDE;
+  virtual void SetDebugState(const LayerTreeDebugState& debug_state) OVERRIDE {}
+  virtual bool MainFrameWillHappenForTesting() OVERRIDE;
+  virtual void AsValueInto(base::debug::TracedValue* state) const OVERRIDE;
 
   virtual RendererCapabilities& GetRendererCapabilities();
   void SetMaxPartialTextureUpdates(size_t max);