Continue with InlineBox float->LayoutUnit migration.

Source/core/rendering/FloatToLayoutUnit.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef FloatToLayoutUnit_h
 #define FloatToLayoutUnit_h
 
+#include "platform/LayoutUnit.h"
+
 namespace blink {
 
-#if ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
-
+class FloatPoint;
+class FloatRect;
+class FloatSize;
 class LayoutUnit;
 class LayoutPoint;
 class LayoutRect;
 class LayoutSize;
 
-using FloatWillBeLayoutUnit = LayoutUnit;
-using FloatPointWillBeLayoutPoint = LayoutPoint;
-using FloatRectWillBeLayoutRect = LayoutRect;
-using FloatSizeWillBeLayoutSize = LayoutSize;
+class LineLayoutUnit {

[leviw_travelin_and_unemployed, 2014/11/12 21:27:45]

This may be easier if you create 2 separate classes, FloatLineLayoutUnit and
LayoutUnitLineLayoutUnit (or something less hideous), and have LineLayoutUnit
just be a "using LineLayoutUnit = FloatLineLayoutUnit". This would make
reasoning around the actual class a lot easier, as you'd only need one ifdef
switch to change the using statement.

[hartmanng, 2014/11/13 16:08:26]

Done.

I did go with the hideous LayoutUnitLineLayoutUnit for now, because anything
else wouldn't really fit the pattern...

One alternative might be LineFloat and LineLayoutUnit? Personally I'm not too
concerned about the naming here, since these internal classes will only ever be
referred to in the "using" statement.

+public:
+#if ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+    LineLayoutUnit(LayoutUnit f) : m_data(f) { }
+#else // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+    LineLayoutUnit(float f) : m_data(f) { }
+#endif // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
 
-#define ZERO_LAYOUT_UNIT LayoutUnit(0)
-#define MINUS_ONE_LAYOUT_UNIT LayoutUnit(-1)
+    float toFloat() const
+    {
+#if ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+        return m_data.toFloat();
+#else // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+        return m_data;
+#endif // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+    }
 
-#define LAYOUT_UNIT_TO_FLOAT(layoutUnit) (layoutUnit)
-#define LAYOUT_UNIT_CEIL(layoutUnit) (layoutUnit.ceil())
-#define INT_TO_LAYOUT_UNIT(i) (LayoutUnit(i))
+    LayoutUnit toLayoutUnit() const
+    {
+#if ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+        return m_data;
+#else // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+        return LayoutUnit(m_data);
+#endif // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+    }
 
+public:
+#if ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+    LayoutUnit m_data;
 #else // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
-
-class FloatPoint;
-class FloatRect;
-class FloatSize;
+    float m_data;
+#endif // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
+};
 
 using FloatWillBeLayoutUnit = float;
 using FloatPointWillBeLayoutPoint = FloatPoint;
 using FloatRectWillBeLayoutRect = FloatRect;
 using FloatSizeWillBeLayoutSize = FloatSize;
 
-#define ZERO_LAYOUT_UNIT 0
-#define MINUS_ONE_LAYOUT_UNIT -1
-
-#define LAYOUT_UNIT_TO_FLOAT(layoutUnit) (layoutUnit.toFloat())
-#define LAYOUT_UNIT_CEIL(layoutUnit) (ceilf(layoutUnit))
-#define INT_TO_LAYOUT_UNIT(i) (i)
-
-#endif // ENABLE(LAYOUT_UNIT_IN_INLINE_BOXES)
-
 } // namespace blink
 
 #endif // FloatToLayoutUnit_h