| Index: sky/engine/core/rendering/RenderObject.cpp
|
| diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp
|
| index 9b663b7207cd65f0123a6dea99eb544bfcbef5c4..1d2773e236d88c352efca4f5de8c278b740fd31b 100644
|
| --- a/sky/engine/core/rendering/RenderObject.cpp
|
| +++ b/sky/engine/core/rendering/RenderObject.cpp
|
| @@ -1766,8 +1766,6 @@ void RenderObject::setStyle(PassRefPtr<RenderStyle> style)
|
| updateImage(oldStyle ? oldStyle->borderImage().image() : 0, m_style->borderImage().image());
|
| updateImage(oldStyle ? oldStyle->maskBoxImage().image() : 0, m_style->maskBoxImage().image());
|
|
|
| - updateShapeImage(oldStyle ? oldStyle->shapeOutside() : 0, m_style->shapeOutside());
|
| -
|
| bool doesNotNeedLayout = !m_parent || isText();
|
|
|
| styleDidChange(diff, oldStyle.get());
|
| @@ -1936,12 +1934,6 @@ void RenderObject::updateImage(StyleImage* oldImage, StyleImage* newImage)
|
| }
|
| }
|
|
|
| -void RenderObject::updateShapeImage(const ShapeValue* oldShapeValue, const ShapeValue* newShapeValue)
|
| -{
|
| - if (oldShapeValue || newShapeValue)
|
| - updateImage(oldShapeValue ? oldShapeValue->image() : 0, newShapeValue ? newShapeValue->image() : 0);
|
| -}
|
| -
|
| LayoutRect RenderObject::viewRect() const
|
| {
|
| return view()->viewRect();
|
| @@ -2363,14 +2355,6 @@ void RenderObject::destroy()
|
| postDestroy();
|
| }
|
|
|
| -void RenderObject::removeShapeImageClient(ShapeValue* shapeValue)
|
| -{
|
| - if (!shapeValue)
|
| - return;
|
| - if (StyleImage* shapeImage = shapeValue->image())
|
| - shapeImage->removeClient(this);
|
| -}
|
| -
|
| void RenderObject::postDestroy()
|
| {
|
| // It seems ugly that this is not in willBeDestroyed().
|
| @@ -2390,8 +2374,6 @@ void RenderObject::postDestroy()
|
|
|
| if (StyleImage* maskBoxImage = m_style->maskBoxImage().image())
|
| maskBoxImage->removeClient(this);
|
| -
|
| - removeShapeImageClient(m_style->shapeOutside());
|
| }
|
| ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->removeRenderObject(this);
|
| #if !ENABLE(OILPAN)
|
|
|