| Index: Source/WebCore/rendering/RenderInline.cpp
|
| diff --git a/Source/WebCore/rendering/RenderInline.cpp b/Source/WebCore/rendering/RenderInline.cpp
|
| index 6788007858ccc6f93b7566fef46e9b0f06900464..40813042c4a5dee5b3a37cbf7242cd98a8e16d33 100644
|
| --- a/Source/WebCore/rendering/RenderInline.cpp
|
| +++ b/Source/WebCore/rendering/RenderInline.cpp
|
| @@ -126,9 +126,9 @@ RenderInline* RenderInline::inlineElementContinuation() const
|
| return toRenderBlock(continuation)->inlineElementContinuation();
|
| }
|
|
|
| -void RenderInline::updateFromStyle()
|
| +void RenderInline::updateFromStyle(const StyleChangeState& state)
|
| {
|
| - RenderBoxModelObject::updateFromStyle();
|
| + RenderBoxModelObject::updateFromStyle(state);
|
|
|
| setInline(true); // Needed for run-ins, since run-in is considered a block display type.
|
|
|
| @@ -163,9 +163,9 @@ static void updateStyleOfAnonymousBlockContinuations(RenderObject* block, const
|
| }
|
| }
|
|
|
| -void RenderInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
|
| +void RenderInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle, const StyleChangeState& state)
|
| {
|
| - RenderBoxModelObject::styleDidChange(diff, oldStyle);
|
| + RenderBoxModelObject::styleDidChange(diff, oldStyle, state);
|
|
|
| // Ensure that all of the split inlines pick up the new style. We
|
| // only do this if we're an inline, since we don't want to propagate
|
|
|