diff options
| author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 23:47:24 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 23:47:24 +0000 |
| commit | 257abfa88bc09c0cb2c95efdb6777d7d40bfe8f2 (patch) | |
| tree | 85dbc8e2b027baa6305fa4bae17ce15c8803e245 /webkit | |
| parent | da2bfa49bd7721d552a8623fe826b438d2411ad8 (diff) | |
| download | chromium_src-257abfa88bc09c0cb2c95efdb6777d7d40bfe8f2.zip chromium_src-257abfa88bc09c0cb2c95efdb6777d7d40bfe8f2.tar.gz chromium_src-257abfa88bc09c0cb2c95efdb6777d7d40bfe8f2.tar.bz2 | |
Delete zoomed_viewport_offset_ and its users.
After http://webk.it/107424 lands, there is no longer any need to conceal
the true scroll offset from WebKit. We can use the normal root
layer scroll offset for almost everything and avoid needing to apply this
extra transformation.
NOTRY=true
BUG=171183
Review URL: https://chromiumcodereview.appspot.com/12045002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index 856e1ec..4ff7b0d 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc @@ -113,7 +113,7 @@ WebSize WebLayerTreeViewImpl::deviceViewportSize() const WebFloatPoint WebLayerTreeViewImpl::adjustEventPointForPinchZoom(const WebFloatPoint& point) const { - return m_layerTreeHost->adjustEventPointForPinchZoom(point); + return point; } void WebLayerTreeViewImpl::setDeviceScaleFactor(const float deviceScaleFactor) diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.h b/webkit/compositor_bindings/web_layer_tree_view_impl.h index c69ccbe..6a133df 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.h +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h @@ -39,7 +39,7 @@ public: virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize = WebSize()) OVERRIDE; virtual WebSize layoutViewportSize() const OVERRIDE; virtual WebSize deviceViewportSize() const OVERRIDE; - virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& point) const OVERRIDE; + virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& point) const; // FIXME: remove this after WebKit roll. virtual void setDeviceScaleFactor(float) OVERRIDE; virtual float deviceScaleFactor() const OVERRIDE; virtual void setBackgroundColor(WebColor) OVERRIDE; |