Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025)

New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/WebCore/rendering/ExclusionShapeInsideInfo.h b/Source/WebCore/rendering/ExclusionShapeInsideInfo.h
index cd93b5fb1..8be114d4b 100644
--- a/Source/WebCore/rendering/ExclusionShapeInsideInfo.h
+++ b/Source/WebCore/rendering/ExclusionShapeInsideInfo.h
@@ -34,7 +34,7 @@
 
 #include "ExclusionShape.h"
 #include "FloatRect.h"
-#include "LayoutTypesInlineMethods.h"
+#include "LayoutUnit.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
@@ -78,14 +78,14 @@ private:
     {
         ASSERT(m_shape);
         // Use fromFloatCeil() to ensure that the returned LayoutUnit value is within the shape's bounds.
-        return FractionalLayoutUnit::fromFloatCeil(m_shape->shapeLogicalBoundingBox().y());
+        return LayoutUnit::fromFloatCeil(m_shape->shapeLogicalBoundingBox().y());
     }
 
     inline LayoutUnit shapeLogicalBoundsMaxY() const
     {
         ASSERT(m_shape);
         // Use fromFloatFloor() to ensure that the returned LayoutUnit value is within the shape's bounds.
-        return FractionalLayoutUnit::fromFloatFloor(m_shape->shapeLogicalBoundingBox().maxY());
+        return LayoutUnit::fromFloatFloor(m_shape->shapeLogicalBoundingBox().maxY());
     }
 
     RenderBlock* m_block;