Continue with InlineBox float->LayoutUnit migration.

Source/core/rendering/InlineBox.h

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 26 matching lines @@
 // InlineBox represents a rectangle that occurs on a line.  It corresponds to
 // some RenderObject (i.e., it represents a portion of that RenderObject).
 class InlineBox {
     WTF_MAKE_NONCOPYABLE(InlineBox);
 public:
     InlineBox(RenderObject& obj)
         : m_next(0)
         , m_prev(0)
         , m_parent(0)
         , m_renderer(obj)
-        , m_logicalWidth(ZERO_LAYOUT_UNIT)
+        , m_logicalWidth(0)
 #if ENABLE(ASSERT)
         , m_hasBadParent(false)
 #endif
     {
     }
 
     InlineBox(RenderObject& obj, FloatPointWillBeLayoutPoint topLeft, FloatWillBeLayoutUnit logicalWidth, bool firstLine, bool constructed,
               bool dirty, bool extracted, bool isHorizontal, InlineBox* next, InlineBox* prev, InlineFlowBox* parent)
         : m_next(next)
         , m_prev(prev)
@@ skipping 66 matching lines @@
 
     virtual bool isSVGInlineTextBox() const { return false; }
     virtual bool isSVGInlineFlowBox() const { return false; }
     virtual bool isSVGRootInlineBox() const { return false; }
 
     bool hasVirtualLogicalHeight() const { return m_bitfields.hasVirtualLogicalHeight(); }
     void setHasVirtualLogicalHeight() { m_bitfields.setHasVirtualLogicalHeight(true); }
     virtual FloatWillBeLayoutUnit virtualLogicalHeight() const
     {
         ASSERT_NOT_REACHED();
-        return ZERO_LAYOUT_UNIT;
+        return 0;
     }
 
     bool isHorizontal() const { return m_bitfields.isHorizontal(); }
     void setIsHorizontal(bool isHorizontal) { m_bitfields.setIsHorizontal(isHorizontal); }
 
     virtual FloatRectWillBeLayoutRect calculateBoundaries() const
     {
         ASSERT_NOT_REACHED();
         return FloatRectWillBeLayoutRect();
     }
@@ skipping 67 matching lines @@
     FloatWillBeLayoutUnit logicalLeft() const { return isHorizontal() ? m_topLeft.x() : m_topLeft.y(); }
     FloatWillBeLayoutUnit logicalRight() const { return logicalLeft() + logicalWidth(); }
     void setLogicalLeft(FloatWillBeLayoutUnit left)
     {
         if (isHorizontal())
             setX(left);
         else
             setY(left);
     }
     int pixelSnappedLogicalLeft() const { return logicalLeft(); }
-    int pixelSnappedLogicalRight() const { return LAYOUT_UNIT_CEIL(logicalRight()); }
+    int pixelSnappedLogicalRight() const { return ceilf(logicalRight()); }
     int pixelSnappedLogicalTop() const { return logicalTop(); }
-    int pixelSnappedLogicalBottom() const { return LAYOUT_UNIT_CEIL(logicalBottom()); }
+    int pixelSnappedLogicalBottom() const { return ceilf(logicalBottom()); }
 
     // The logicalTop[ position is the top edge of the line box in a horizontal line and the left edge in a vertical line.
     FloatWillBeLayoutUnit logicalTop() const { return isHorizontal() ? m_topLeft.y() : m_topLeft.x(); }
     FloatWillBeLayoutUnit logicalBottom() const { return logicalTop() + logicalHeight(); }
     void setLogicalTop(FloatWillBeLayoutUnit top)
     {
         if (isHorizontal())
             setY(top);
         else
             setX(top);
@@ skipping 201 matching lines @@
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::InlineBox*);
 void showLineTree(const blink::InlineBox*);
 #endif
 
 #endif // InlineBox_h