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

Unified Diff: cc/layer_tree_host_impl.cc

Issue 11293194: ui: Prefer +/- operators to apply offsets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: floats Created 8 years, 1 month 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
Index: cc/layer_tree_host_impl.cc
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index ead24a45fa1790c1b2c9d8ba54620ddd4b89e279..60ae08f6c4150c46a339ac01471d776a2898c9f0 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -100,21 +100,17 @@ bool PinchZoomViewport::setPageScaleFactorAndLimits(float pageScaleFactor, float
gfx::RectF PinchZoomViewport::bounds() const
{
- gfx::SizeF scaledViewportSize = m_layoutViewportSize;
- scaledViewportSize = scaledViewportSize.Scale(1 / totalPageScaleFactor());
-
- gfx::RectF bounds(gfx::PointF(), scaledViewportSize);
- bounds.Offset(m_pinchViewportScrollDelta);
-
+ gfx::RectF bounds(gfx::PointF(), m_layoutViewportSize);
+ bounds.Scale(1 / totalPageScaleFactor());
+ bounds += m_pinchViewportScrollDelta;
return bounds;
}
gfx::Vector2dF PinchZoomViewport::applyScroll(const gfx::Vector2dF& delta)
{
gfx::Vector2dF overflow;
- gfx::RectF pinchedBounds = bounds();
+ gfx::RectF pinchedBounds = bounds() + delta;
- pinchedBounds.Offset(delta);
if (pinchedBounds.x() < 0) {
overflow.set_x(pinchedBounds.x());
pinchedBounds.set_x(0);
@@ -127,12 +123,12 @@ gfx::Vector2dF PinchZoomViewport::applyScroll(const gfx::Vector2dF& delta)
if (pinchedBounds.right() > m_layoutViewportSize.width()) {
overflow.set_x(pinchedBounds.right() - m_layoutViewportSize.width());
- pinchedBounds.Offset(m_layoutViewportSize.width() - pinchedBounds.right(), 0);
+ pinchedBounds += gfx::Vector2dF(m_layoutViewportSize.width() - pinchedBounds.right(), 0);
}
if (pinchedBounds.bottom() > m_layoutViewportSize.height()) {
overflow.set_y(pinchedBounds.bottom() - m_layoutViewportSize.height());
- pinchedBounds.Offset(0, m_layoutViewportSize.height() - pinchedBounds.bottom());
+ pinchedBounds += gfx::Vector2dF(0, m_layoutViewportSize.height() - pinchedBounds.bottom());
}
m_pinchViewportScrollDelta = pinchedBounds.OffsetFromOrigin();

Powered by Google App Engine
This is Rietveld 408576698