| Index: Source/core/rendering/RenderBoxModelObject.cpp
|
| diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp
|
| index 8b46f82e0f8e7502527ea8e78fa7ef7b08a563b1..687b5f4faf90176e6690b5d841c4a986f8325b74 100644
|
| --- a/Source/core/rendering/RenderBoxModelObject.cpp
|
| +++ b/Source/core/rendering/RenderBoxModelObject.cpp
|
| @@ -128,12 +128,19 @@ void RenderBoxModelObject::willBeDestroyed()
|
| RenderLayerModelObject::willBeDestroyed();
|
| }
|
|
|
| +bool RenderBoxModelObject::calculateHasBoxDecorations() const
|
| +{
|
| + RenderStyle* styleToUse = style();
|
| + ASSERT(styleToUse);
|
| + return hasBackground() || styleToUse->hasBorder() || styleToUse->hasAppearance() || styleToUse->boxShadow();
|
| +}
|
| +
|
| void RenderBoxModelObject::updateFromStyle()
|
| {
|
| RenderLayerModelObject::updateFromStyle();
|
|
|
| RenderStyle* styleToUse = style();
|
| - setHasBoxDecorations(hasBackground() || styleToUse->hasBorder() || styleToUse->hasAppearance() || styleToUse->boxShadow());
|
| + setHasBoxDecorations(calculateHasBoxDecorations());
|
| setInline(styleToUse->isDisplayInlineType());
|
| setPositionState(styleToUse->position());
|
| setHorizontalWritingMode(styleToUse->isHorizontalWritingMode());
|
|
|