diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:46:18 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 02:46:18 +0000 |
| commit | 03cc7ab013209c66ffb5fef69ea13fc461b76045 (patch) | |
| tree | 50420988ebd0b087921b89ccdc9dc1f4ed142ae5 /webkit | |
| parent | 74d85b57d6a3a205c296ee567f13a4b2d228cd26 (diff) | |
| download | chromium_src-03cc7ab013209c66ffb5fef69ea13fc461b76045.zip chromium_src-03cc7ab013209c66ffb5fef69ea13fc461b76045.tar.gz chromium_src-03cc7ab013209c66ffb5fef69ea13fc461b76045.tar.bz2 | |
Deoptionalize WebLayerTreeView::setViewportSize
Chromium side of http://trac.webkit.org/changeset/141920. A missing/empty device
viewport doesn't make any sense.
BUG=
Review URL: https://chromiumcodereview.appspot.com/12217019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -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. |