diff options
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.cc | 5 | ||||
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index f8e8d54..b7a7101 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc @@ -97,10 +97,7 @@ void WebLayerTreeViewImpl::clearRootLayer() void WebLayerTreeViewImpl::setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize) { - if (!deviceViewportSize.isEmpty()) - m_layerTreeHost->setViewportSize(layoutViewportSize, deviceViewportSize); - else - m_layerTreeHost->setViewportSize(layoutViewportSize, layoutViewportSize); + m_layerTreeHost->setViewportSize(layoutViewportSize, deviceViewportSize); } WebSize WebLayerTreeViewImpl::layoutViewportSize() const diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.h b/webkit/compositor_bindings/web_layer_tree_view_impl.h index 6a133df..7c93b5d 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.h +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h @@ -36,7 +36,7 @@ public: virtual void setSurfaceReady() OVERRIDE; virtual void setRootLayer(const WebLayer&) OVERRIDE; virtual void clearRootLayer() OVERRIDE; - virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize = WebSize()) OVERRIDE; + virtual void setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize) OVERRIDE; virtual WebSize layoutViewportSize() const OVERRIDE; virtual WebSize deviceViewportSize() const OVERRIDE; virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint& point) const; // FIXME: remove this after WebKit roll. |