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

Unified Diff: Source/core/rendering/FloatToLayoutUnit.h

Issue 699683002: Continue with InlineBox float->LayoutUnit migration. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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
« no previous file with comments | « Source/core/rendering/EllipsisBox.cpp ('k') | Source/core/rendering/InlineBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/FloatToLayoutUnit.h
diff --git a/Source/core/rendering/FloatToLayoutUnit.h b/Source/core/rendering/FloatToLayoutUnit.h
index 456139ef602ddcbb8ca44cb11349d3d84a5a5254..30a699d35e01d372a172a1a128fccd2bda10632a 100644
--- a/Source/core/rendering/FloatToLayoutUnit.h
+++ b/Source/core/rendering/FloatToLayoutUnit.h
@@ -23,8 +23,11 @@ using FloatSizeWillBeLayoutSize = LayoutSize;
#define MINUS_ONE_LAYOUT_UNIT LayoutUnit(-1)
#define LAYOUT_UNIT_TO_FLOAT(layoutUnit) (layoutUnit)
+#define WILL_BE_LAYOUT_UNIT_TO_FLOAT(layoutUnit) (layoutUnit.toFloat())
leviw_travelin_and_unemployed 2014/11/03 21:35:02 These names don't actually seem self-identifying t
#define LAYOUT_UNIT_CEIL(layoutUnit) (layoutUnit.ceil())
#define INT_TO_LAYOUT_UNIT(i) (LayoutUnit(i))
+#define WILL_BE_LAYOUT_UNIT_TO_INT(layoutUnit) (layoutUnit.toInt())
+#define LAYOUT_UNIT_ROUND(layoutUnit) (layoutUnit.round())
#else // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
@@ -41,8 +44,11 @@ using FloatSizeWillBeLayoutSize = FloatSize;
#define MINUS_ONE_LAYOUT_UNIT -1
#define LAYOUT_UNIT_TO_FLOAT(layoutUnit) (layoutUnit.toFloat())
+#define WILL_BE_LAYOUT_UNIT_TO_FLOAT(layoutUnit) (layoutUnit)
#define LAYOUT_UNIT_CEIL(layoutUnit) (ceilf(layoutUnit))
#define INT_TO_LAYOUT_UNIT(i) (i)
+#define WILL_BE_LAYOUT_UNIT_TO_INT(layoutUnit) (layoutUnit)
+#define LAYOUT_UNIT_ROUND(layoutUnit) (lroundf(layoutUnit))
#endif // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
« no previous file with comments | « Source/core/rendering/EllipsisBox.cpp ('k') | Source/core/rendering/InlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698