diff options
author | miletus <miletus@chromium.org> | 2014-10-10 08:39:29 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-10 15:39:39 +0000 |
commit | d2061d67be46908bb069329c9278a98ad39fc8cb (patch) | |
tree | 80de84c2ea92ba352930c472be62766c0ffee1a1 /cc | |
parent | ac1216a904719ebe0a7ba6ab3936571f6bd74caa (diff) | |
download | chromium_src-d2061d67be46908bb069329c9278a98ad39fc8cb.zip chromium_src-d2061d67be46908bb069329c9278a98ad39fc8cb.tar.gz chromium_src-d2061d67be46908bb069329c9278a98ad39fc8cb.tar.bz2 |
Remove WebPoint version of WebLayerImpl::setScrollPosition
Now that blink side interface WebLayer::setScrollPosition
has changed to use WebDoublePoint version, we can remove
the WebPoint version in WebLayerImpl.
BUG=414283
Review URL: https://codereview.chromium.org/636283003
Cr-Commit-Position: refs/heads/master@{#299120}
Diffstat (limited to 'cc')
-rw-r--r-- | cc/blink/web_layer_impl.cc | 9 | ||||
-rw-r--r-- | cc/blink/web_layer_impl.h | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc index 5d181ab..b64a227 100644 --- a/cc/blink/web_layer_impl.cc +++ b/cc/blink/web_layer_impl.cc @@ -268,15 +268,6 @@ void WebLayerImpl::setForceRenderSurface(bool force_render_surface) { layer_->SetForceRenderSurface(force_render_surface); } -void WebLayerImpl::setScrollPosition(blink::WebPoint position) { - layer_->SetScrollOffset(gfx::ScrollOffset(position.x, position.y)); -} - -blink::WebPoint WebLayerImpl::scrollPosition() const { - return gfx::PointAtOffsetFromOrigin( - gfx::ScrollOffsetToFlooredVector2d(layer_->scroll_offset())); -} - void WebLayerImpl::setScrollPositionDouble(blink::WebDoublePoint position) { layer_->SetScrollOffset(gfx::ScrollOffset(position.x, position.y)); } diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h index 75f8a55..9928e07 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); |