| Index: Source/core/rendering/RenderBlockFlow.cpp
|
| diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
|
| index 8e86cd9c3a371df555fd7d5b3ae7a4a0cf41af42..95029c233ccf03cef1c987d1c4be8df20278dec1 100644
|
| --- a/Source/core/rendering/RenderBlockFlow.cpp
|
| +++ b/Source/core/rendering/RenderBlockFlow.cpp
|
| @@ -1819,12 +1819,12 @@ void RenderBlockFlow::createFloatingObjects()
|
| m_floatingObjects = adoptPtr(new FloatingObjects(this, isHorizontalWritingMode()));
|
| }
|
|
|
| -void RenderBlockFlow::styleWillChange(StyleDifference diff, const RenderStyle* newStyle)
|
| +void RenderBlockFlow::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
|
| {
|
| RenderStyle* oldStyle = style();
|
| s_canPropagateFloatIntoSibling = oldStyle ? !isFloatingOrOutOfFlowPositioned() && !avoidsFloats() : false;
|
| - if (oldStyle && parent() && diff == StyleDifferenceLayout && oldStyle->position() != newStyle->position()
|
| - && containsFloats() && !isFloating() && !isOutOfFlowPositioned() && newStyle->hasOutOfFlowPosition())
|
| + if (oldStyle && parent() && diff == StyleDifferenceLayout && oldStyle->position() != newStyle.position()
|
| + && containsFloats() && !isFloating() && !isOutOfFlowPositioned() && newStyle.hasOutOfFlowPosition())
|
| markAllDescendantsWithFloatsForLayout();
|
|
|
| RenderBlock::styleWillChange(diff, newStyle);
|
|
|