| Index: Source/core/rendering/RenderObject.cpp
|
| diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
|
| index 82c6a94c70ae77bd2f0b85075f29ad67cb1ab6a6..d18901ebb09148a86ab36a8046f0f14cbc69c7b6 100644
|
| --- a/Source/core/rendering/RenderObject.cpp
|
| +++ b/Source/core/rendering/RenderObject.cpp
|
| @@ -1934,12 +1934,6 @@ void RenderObject::setStyle(PassRefPtr<RenderStyle> style)
|
| updateShapeImage(oldStyle ? oldStyle->shapeInside() : 0, m_style ? m_style->shapeInside() : 0);
|
| updateShapeImage(oldStyle ? oldStyle->shapeOutside() : 0, m_style ? m_style->shapeOutside() : 0);
|
|
|
| - // We need to ensure that view->maximalOutlineSize() is valid for any repaints that happen
|
| - // during styleDidChange (it's used by clippedOverflowRectForRepaint()).
|
| - // FIXME: Do this more cleanly. http://crbug.com/273904
|
| - if (m_style->outlineWidth() > 0 && m_style->outlineSize() > view()->maximalOutlineSize())
|
| - view()->setMaximalOutlineSize(m_style->outlineSize());
|
| -
|
| bool doesNotNeedLayout = !m_parent || isText();
|
|
|
| styleDidChange(diff, oldStyle.get());
|
| @@ -3099,13 +3093,6 @@ bool RenderObject::willRenderImage(ImageResource*)
|
| return document().view()->isVisible();
|
| }
|
|
|
| -int RenderObject::maximalOutlineSize(PaintPhase p) const
|
| -{
|
| - if (p != PaintPhaseOutline && p != PaintPhaseSelfOutline && p != PaintPhaseChildOutlines)
|
| - return 0;
|
| - return view()->maximalOutlineSize();
|
| -}
|
| -
|
| int RenderObject::caretMinOffset() const
|
| {
|
| return 0;
|
|
|