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

Unified Diff: Source/core/layout/line/EllipsisBox.cpp

Issue 1043643002: Switch line layout to LayoutUnit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: More TestExpectations tweaks Created 5 years, 7 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 | « Source/core/layout/line/EllipsisBox.h ('k') | Source/core/layout/line/FloatToLayoutUnit.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/EllipsisBox.cpp
diff --git a/Source/core/layout/line/EllipsisBox.cpp b/Source/core/layout/line/EllipsisBox.cpp
index 676c8a594f20c59d142029398d4db18c3d878db7..9cb43b68999ba90df3e1e3a99205ea7244335075 100644
--- a/Source/core/layout/line/EllipsisBox.cpp
+++ b/Source/core/layout/line/EllipsisBox.cpp
@@ -48,16 +48,16 @@ bool EllipsisBox::nodeAtPoint(HitTestResult& result, const HitTestLocation& loca
{
// FIXME: the call to roundedLayoutPoint() below is temporary and should be removed once
// the transition to LayoutUnit-based types is complete (crbug.com/321237)
- LayoutPoint adjustedLocation = accumulatedOffset + topLeft().roundedLayoutPoint();
+ LayoutPoint adjustedLocation = accumulatedOffset + topLeft();
- FloatPointWillBeLayoutPoint boxOrigin = locationIncludingFlipping();
+ LayoutPoint boxOrigin = locationIncludingFlipping();
boxOrigin.moveBy(accumulatedOffset);
- FloatRectWillBeLayoutRect boundsRect(boxOrigin, size());
- if (visibleToHitTestRequest(result.hitTestRequest()) && boundsRect.intersects(FloatRectWillBeLayoutRect(HitTestLocation::rectForPoint(locationInContainer.point(), 0, 0, 0, 0)))) {
+ LayoutRect boundsRect(boxOrigin, size());
+ if (visibleToHitTestRequest(result.hitTestRequest()) && boundsRect.intersects(LayoutRect(HitTestLocation::rectForPoint(locationInContainer.point(), 0, 0, 0, 0)))) {
layoutObject().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(adjustedLocation));
// FIXME: the call to rawValue() below is temporary and should be removed once the transition
// to LayoutUnit-based types is complete (crbug.com/321237)
- if (!result.addNodeToListBasedTestResult(layoutObject().node(), locationInContainer, boundsRect.rawValue()))
+ if (!result.addNodeToListBasedTestResult(layoutObject().node(), locationInContainer, boundsRect))
return true;
}
« no previous file with comments | « Source/core/layout/line/EllipsisBox.h ('k') | Source/core/layout/line/FloatToLayoutUnit.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698