| Index: Source/core/rendering/exclusions/ExclusionShapeInfo.cpp
|
| diff --git a/Source/core/rendering/exclusions/ExclusionShapeInfo.cpp b/Source/core/rendering/exclusions/ExclusionShapeInfo.cpp
|
| index 65b615d23e21291861b546b375accb76a552fd21..3d9371ee67c918f978f0318255fcab6c75717e4e 100644
|
| --- a/Source/core/rendering/exclusions/ExclusionShapeInfo.cpp
|
| +++ b/Source/core/rendering/exclusions/ExclusionShapeInfo.cpp
|
| @@ -37,7 +37,7 @@
|
| #include "core/rendering/style/RenderStyle.h"
|
|
|
| namespace WebCore {
|
| -template<class RenderType, ExclusionShapeValue* (RenderStyle::*shapeGetter)() const, void (ExclusionShape::*intervalGetter)(float, float, SegmentList&) const>
|
| +template<class RenderType, ExclusionShapeValue* (RenderStyle::*shapeGetter)() const, void (ExclusionShape::*intervalGetter)(LayoutUnit, LayoutUnit, SegmentList&) const>
|
| const ExclusionShape* ExclusionShapeInfo<RenderType, shapeGetter, intervalGetter>::computedShape() const
|
| {
|
| if (ExclusionShape* exclusionShape = m_shape.get())
|
| @@ -48,12 +48,12 @@ const ExclusionShape* ExclusionShapeInfo<RenderType, shapeGetter, intervalGetter
|
|
|
| ASSERT(shape);
|
|
|
| - m_shape = ExclusionShape::createExclusionShape(shape, m_shapeLogicalWidth, m_shapeLogicalHeight, m_renderer->style()->writingMode(), m_renderer->style()->shapeMargin(), m_renderer->style()->shapePadding());
|
| + m_shape = ExclusionShape::createExclusionShape(shape, LayoutSize(m_shapeLogicalWidth, m_shapeLogicalHeight), m_renderer->style()->writingMode(), m_renderer->style()->shapeMargin(), m_renderer->style()->shapePadding());
|
| ASSERT(m_shape);
|
| return m_shape.get();
|
| }
|
|
|
| -template<class RenderType, ExclusionShapeValue* (RenderStyle::*shapeGetter)() const, void (ExclusionShape::*intervalGetter)(float, float, SegmentList&) const>
|
| +template<class RenderType, ExclusionShapeValue* (RenderStyle::*shapeGetter)() const, void (ExclusionShape::*intervalGetter)(LayoutUnit, LayoutUnit, SegmentList&) const>
|
| LayoutUnit ExclusionShapeInfo<RenderType, shapeGetter, intervalGetter>::logicalTopOffset() const
|
| {
|
| LayoutUnit logicalTopOffset = m_renderer->style()->boxSizing() == CONTENT_BOX ? m_renderer->borderBefore() + m_renderer->paddingBefore() : LayoutUnit();
|
| @@ -63,7 +63,7 @@ LayoutUnit ExclusionShapeInfo<RenderType, shapeGetter, intervalGetter>::logicalT
|
| return logicalTopOffset;
|
| }
|
|
|
| -template<class RenderType, ExclusionShapeValue* (RenderStyle::*shapeGetter)() const, void (ExclusionShape::*intervalGetter)(float, float, SegmentList&) const>
|
| +template<class RenderType, ExclusionShapeValue* (RenderStyle::*shapeGetter)() const, void (ExclusionShape::*intervalGetter)(LayoutUnit, LayoutUnit, SegmentList&) const>
|
| bool ExclusionShapeInfo<RenderType, shapeGetter, intervalGetter>::computeSegmentsForLine(LayoutUnit lineTop, LayoutUnit lineHeight)
|
| {
|
| ASSERT(lineHeight >= 0);
|
|
|