Index: Source/core/rendering/InlineBox.h |
diff --git a/Source/core/rendering/InlineBox.h b/Source/core/rendering/InlineBox.h |
index b8a00f12aa4c1c9a045e701ad239ef350b1037fe..ee5627ba60aaf780eb908d3611f78bc70efa9e9b 100644 |
--- a/Source/core/rendering/InlineBox.h |
+++ b/Source/core/rendering/InlineBox.h |
@@ -44,7 +44,7 @@ public: |
, m_prev(0) |
, m_parent(0) |
, m_renderer(obj) |
- , m_logicalWidth(ZERO_LAYOUT_UNIT) |
+ , m_logicalWidth(0) |
#if ENABLE(ASSERT) |
, m_hasBadParent(false) |
#endif |
@@ -131,7 +131,7 @@ public: |
virtual FloatWillBeLayoutUnit virtualLogicalHeight() const |
{ |
ASSERT_NOT_REACHED(); |
- return ZERO_LAYOUT_UNIT; |
+ return 0; |
} |
bool isHorizontal() const { return m_bitfields.isHorizontal(); } |
@@ -219,9 +219,9 @@ public: |
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(); } |