| Index: webkit/compositor_bindings/web_layer_tree_view_impl.h
|
| diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.h b/webkit/compositor_bindings/web_layer_tree_view_impl.h
|
| index 686065bbe3bf56902c818a7997491c37d4e8e1a6..fa9610e40b237b9409bb1cd193c467595dbdfef9 100644
|
| --- a/webkit/compositor_bindings/web_layer_tree_view_impl.h
|
| +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h
|
| @@ -49,13 +49,12 @@ public:
|
| virtual void setNeedsRedraw() OVERRIDE;
|
| virtual bool commitRequested() const OVERRIDE;
|
| virtual void composite() OVERRIDE;
|
| - // TODO(ajuma): Remove this after WebKit bug 106594 (which switches to using the 2-argument version) lands.
|
| - virtual void updateAnimations(double frameBeginTime);
|
| - virtual void updateAnimations(double monotonicFrameBeginTime, double wallClockFrameBeginTime);
|
| + virtual void updateAnimations(double monotonicFrameBeginTime, double wallClockFrameBeginTime) OVERRIDE;
|
| virtual void didStopFlinging() OVERRIDE;
|
| virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE;
|
| virtual void finishAllRendering() OVERRIDE;
|
| virtual void setDeferCommits(bool deferCommits) OVERRIDE;
|
| + virtual void registerForAnimations(WebLayer* layer) OVERRIDE;
|
| virtual void renderingStats(WebRenderingStats&) const OVERRIDE;
|
| virtual void setShowFPSCounter(bool show);
|
| virtual void setShowPaintRects(bool show);
|
|
|