Chromium Code Reviews| Index: Source/core/layout/FloatingObjects.cpp |
| diff --git a/Source/core/layout/FloatingObjects.cpp b/Source/core/layout/FloatingObjects.cpp |
| index 053334a7a406fda0c92a1e283361d6484502e4e1..e019e5b08af8c62e1743c97266e042315fe4ae1e 100644 |
| --- a/Source/core/layout/FloatingObjects.cpp |
| +++ b/Source/core/layout/FloatingObjects.cpp |
| @@ -27,6 +27,7 @@ |
| #include "core/layout/LayoutBlockFlow.h" |
| #include "core/layout/LayoutBox.h" |
| #include "core/layout/LayoutView.h" |
| +#include "core/layout/shapes/ShapeOutsideInfo.h" |
| using namespace WTF; |
| @@ -515,7 +516,7 @@ inline bool ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatLeft>::u |
| { |
| LayoutUnit logicalRight = m_layoutObject->logicalRightForFloat(floatingObject); |
| if (ShapeOutsideInfo* shapeOutside = floatingObject.layoutObject()->shapeOutsideInfo()) { |
| - ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(*m_layoutObject, floatingObject, m_lineTop, m_lineBottom - m_lineTop); |
| + ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(const_cast<LayoutBlockFlow*>(m_layoutObject), floatingObject, m_lineTop, m_lineBottom - m_lineTop); |
|
leviw_travelin_and_unemployed
2015/06/23 18:39:19
Is the const_cast necessary because you took the c
|
| if (!shapeDeltas.lineOverlapsShape()) |
| return false; |
| @@ -534,7 +535,7 @@ inline bool ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatRight>:: |
| { |
| LayoutUnit logicalLeft = m_layoutObject->logicalLeftForFloat(floatingObject); |
| if (ShapeOutsideInfo* shapeOutside = floatingObject.layoutObject()->shapeOutsideInfo()) { |
| - ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(*m_layoutObject, floatingObject, m_lineTop, m_lineBottom - m_lineTop); |
| + ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(const_cast<LayoutBlockFlow*>(m_layoutObject), floatingObject, m_lineTop, m_lineBottom - m_lineTop); |
| if (!shapeDeltas.lineOverlapsShape()) |
| return false; |