Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8118)

Unified Diff: cc/input/pinch_zoom_scrollbar.cc

Issue 13637017: Delete layout_viewport_size. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | cc/layers/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/input/pinch_zoom_scrollbar.cc
diff --git a/cc/input/pinch_zoom_scrollbar.cc b/cc/input/pinch_zoom_scrollbar.cc
index e28781011b9517e6a8a366a49acc517cb8ddd009..1fb1019ab4790ce5cd09aa56823033ce4ad6202a 100644
--- a/cc/input/pinch_zoom_scrollbar.cc
+++ b/cc/input/pinch_zoom_scrollbar.cc
@@ -7,6 +7,7 @@
#include "cc/input/pinch_zoom_scrollbar_geometry.h"
#include "cc/layers/layer.h"
#include "cc/trees/layer_tree_host.h"
+#include "ui/gfx/size_conversions.h"
namespace cc {
@@ -39,14 +40,7 @@ WebKit::WebPoint PinchZoomScrollbar::location() const {
}
WebKit::WebSize PinchZoomScrollbar::size() const {
- gfx::Size viewport_size = owner_->layout_viewport_size();
- gfx::Size size;
- int track_width = PinchZoomScrollbarGeometry::kTrackWidth;
- if (orientation_ == WebKit::WebScrollbar::Horizontal)
- size = gfx::Size(viewport_size.width() - track_width, track_width);
- else
- size = gfx::Size(track_width, viewport_size.height() - track_width);
- return WebKit::WebSize(size);
+ return owner_->PinchZoomScrollbarSize(orientation_);
}
bool PinchZoomScrollbar::enabled() const {
« no previous file with comments | « no previous file | cc/layers/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698