cc/page_scale_animation.cc - Issue 11358240: ui: Add methods to Rect classes to get points at each of the rect's corners.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/page_scale_animation.cc

Issue 11358240: ui: Add methods to Rect classes to get points at each of the rect's corners. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: update cc 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/page_scale_animation.cc

diff --git a/cc/page_scale_animation.cc b/cc/page_scale_animation.cc

index e1d5f45436eeae4a27b6e37378c776e2d5ff654e..b8f1fe6185899e4426bdcdbaf1d406e84684b415 100644

--- a/cc/page_scale_animation.cc

+++ b/cc/page_scale_animation.cc

@@ -5,7 +5,6 @@

#include "cc/page_scale_animation.h"

#include "base/logging.h"

-#include "cc/geometry.h"

#include "ui/gfx/point_f.h"

#include "ui/gfx/rect_f.h"

#include "ui/gfx/vector2d_conversions.h"

@@ -117,7 +116,7 @@ void PageScaleAnimation::inferTargetAnchorFromScrollOffsets()

void PageScaleAnimation::clampTargetScrollOffset()

{

- gfx::Vector2dF maxScrollOffset = BottomRight(gfx::RectF(m_rootLayerSize)) - BottomRight(gfx::RectF(targetViewportSize()));

+ gfx::Vector2dF maxScrollOffset = gfx::RectF(m_rootLayerSize).bottom_right() - gfx::RectF(targetViewportSize()).bottom_right();

m_targetScrollOffset.ClampToMin(gfx::Vector2dF());

m_targetScrollOffset.ClampToMax(maxScrollOffset);

}

« no previous file with comments | « cc/layer_tree_host_impl_unittest.cc ('k') | cc/tiled_layer.cc » ('j') | no next file with comments »