Update WebLayerTreeViewClient overrides for WebKit API change

ui/gfx/compositor/compositor_cc.h

Index: ui/gfx/compositor/compositor_cc.h
diff --git a/ui/gfx/compositor/compositor_cc.h b/ui/gfx/compositor/compositor_cc.h
index 201df164f27fc811d0360a98f883052d11c61708..9888e7c784b78d5e5959aef2f1aad0647b80c5d6 100644
--- a/ui/gfx/compositor/compositor_cc.h
+++ b/ui/gfx/compositor/compositor_cc.h
@@ -101,7 +101,12 @@ class COMPOSITOR_EXPORT CompositorCC
   virtual bool ReadPixels(SkBitmap* bitmap, const gfx::Rect& bounds) OVERRIDE;
 
   // WebLayerTreeViewClient implementation.
+  // TODO(jamesr): Remove this override once upstream declaration is removed and
+  // rolled into DEPS
   virtual void animateAndLayout(double frameBeginTime);
+
+  virtual void updateAnimations(double frameBeginTime);
+  virtual void layout();
   virtual void applyScrollAndScale(const WebKit::WebSize& scrollDelta,
                                    float scaleFactor);
   virtual void applyScrollDelta(const WebKit::WebSize&);