summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 04:58:40 +0000
committeraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-09 04:58:40 +0000
commit18ce5970341cca6e54068f93e2a9a5868ac87e4f (patch)
tree9b8deca3d7607adb48077b45e062b5c3ca70390d /webkit
parent71c34d4002250050679e0bfc85fa428de3df7851 (diff)
downloadchromium_src-18ce5970341cca6e54068f93e2a9a5868ac87e4f.zip
chromium_src-18ce5970341cca6e54068f93e2a9a5868ac87e4f.tar.gz
chromium_src-18ce5970341cca6e54068f93e2a9a5868ac87e4f.tar.bz2
Delete layout_viewport_size.
This value is redundant. We can use the root cliprect size or the device_viewport_size divided by device_scale_factor instead. This value was only used by PinchZoomScrollbars, I replaced it with one that should be equivalent. NOTRY=true BUG=229098 Review URL: https://chromiumcodereview.appspot.com/13637017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc6
-rw-r--r--webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
index 5b27381..c635a25 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc
@@ -76,13 +76,13 @@ void WebLayerTreeViewImplForTesting::clearRootLayer() {
}
void WebLayerTreeViewImplForTesting::setViewportSize(
- const WebSize& layout_viewport_size,
+ const WebSize& unused_deprecated,
const WebSize& device_viewport_size) {
- layer_tree_host_->SetViewportSize(layout_viewport_size, device_viewport_size);
+ layer_tree_host_->SetViewportSize(device_viewport_size);
}
WebSize WebLayerTreeViewImplForTesting::layoutViewportSize() const {
- return layer_tree_host_->layout_viewport_size();
+ return layer_tree_host_->device_viewport_size();
}
WebSize WebLayerTreeViewImplForTesting::deviceViewportSize() const {
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h
index 14fc293..18644d2 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h
@@ -35,7 +35,7 @@ class WebLayerTreeViewImplForTesting : public WebKit::WebLayerTreeView,
virtual void setSurfaceReady();
virtual void setRootLayer(const WebKit::WebLayer& layer);
virtual void clearRootLayer();
- virtual void setViewportSize(const WebKit::WebSize& layout_viewport_size,
+ virtual void setViewportSize(const WebKit::WebSize& unused_deprecated,
const WebKit::WebSize& device_viewport_size);
virtual WebKit::WebSize layoutViewportSize() const;
virtual WebKit::WebSize deviceViewportSize() const;