Index: cc/blink/web_layer_impl.h |
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h |
index 75f8a55f53392a37a61645fba09af7ef234d2190..86b386de27128d71db9809f6ff0b4209fe19c90a 100644 |
--- a/cc/blink/web_layer_impl.h |
+++ b/cc/blink/web_layer_impl.h |
@@ -103,10 +103,6 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { |
virtual void pauseAnimation(int animation_id, double time_offset); |
virtual bool hasActiveAnimation(); |
virtual void setForceRenderSurface(bool force); |
- // TODO(miletus): Add the WebDoublePoint version to WebLayer and then remove |
- // the WebPoint version from WebLayer and WebLayerImpl. |
- virtual void setScrollPosition(blink::WebPoint position); |
- virtual blink::WebPoint scrollPosition() const; |
virtual void setScrollPositionDouble(blink::WebDoublePoint position); |
virtual blink::WebDoublePoint scrollPositionDouble() const; |
virtual void setScrollClipLayer(blink::WebLayer* clip_layer); |
@@ -136,8 +132,7 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { |
virtual void setWebLayerClient(blink::WebLayerClient* client); |
// LayerClient implementation. |
- virtual scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() |
- override; |
+ scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo() override; |
danakj
2014/10/09 20:11:17
i think clang plugin still complains about virtual
Yufeng Shen (Slow to review)
2014/10/09 20:13:02
Yeah, presubmit complains about it so I thought I
danakj
2014/10/09 20:14:11
Do you know which presubmit check it is? (can you
jamesr
2014/10/09 20:14:18
Presubmit is wrong until the clang plugin actually
|
virtual void setScrollParent(blink::WebLayer* parent); |
virtual void setClipParent(blink::WebLayer* parent); |