| Index: Source/core/rendering/RenderObject.h
|
| diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h
|
| index b34a4235ee08b37d0d093df6affd9f596ff6f124..6341809527be773ef51cbd423a83402df842eade 100644
|
| --- a/Source/core/rendering/RenderObject.h
|
| +++ b/Source/core/rendering/RenderObject.h
|
| @@ -104,11 +104,6 @@ enum MarkingBehavior {
|
| MarkContainingBlockChain,
|
| };
|
|
|
| -enum RepaintLayerBehavior {
|
| - RepaintLayer,
|
| - DontRepaintLayer,
|
| -};
|
| -
|
| enum MapCoordinatesMode {
|
| IsFixed = 1 << 0,
|
| UseTransforms = 1 << 1,
|
| @@ -629,7 +624,7 @@ public:
|
| Element* offsetParent() const;
|
|
|
| void markContainingBlocksForLayout(bool scheduleRelayout = true, RenderObject* newRoot = 0, SubtreeLayoutScope* = 0);
|
| - void setNeedsLayout(MarkingBehavior = MarkContainingBlockChain, SubtreeLayoutScope* = 0, RepaintLayerBehavior = RepaintLayer);
|
| + void setNeedsLayout(MarkingBehavior = MarkContainingBlockChain, SubtreeLayoutScope* = 0);
|
| void clearNeedsLayout();
|
| void setChildNeedsLayout(MarkingBehavior = MarkContainingBlockChain, SubtreeLayoutScope* = 0);
|
| void setNeedsPositionedMovementLayout();
|
| @@ -1278,7 +1273,7 @@ inline bool RenderObject::isBeforeOrAfterContent() const
|
| return isBeforeContent() || isAfterContent();
|
| }
|
|
|
| -inline void RenderObject::setNeedsLayout(MarkingBehavior markParents, SubtreeLayoutScope* layouter, RepaintLayerBehavior repaintLayer)
|
| +inline void RenderObject::setNeedsLayout(MarkingBehavior markParents, SubtreeLayoutScope* layouter)
|
| {
|
| ASSERT(!isSetNeedsLayoutForbidden());
|
| bool alreadyNeededLayout = m_bitfields.selfNeedsLayout();
|
| @@ -1286,10 +1281,7 @@ inline void RenderObject::setNeedsLayout(MarkingBehavior markParents, SubtreeLay
|
| if (!alreadyNeededLayout) {
|
| if (markParents == MarkContainingBlockChain && (!layouter || layouter->root() != this))
|
| markContainingBlocksForLayout(true, 0, layouter);
|
| - // StyleDifferenceLayout is used for different cases currently, one of which is
|
| - // that our content changed which mandates an invalidation.
|
| - // FIXME: We should be able to skip this automatic invalidation (see crbug.com/325569).
|
| - if (repaintLayer == RepaintLayer && hasLayer())
|
| + if (hasLayer())
|
| setLayerNeedsFullRepaint();
|
| }
|
| }
|
|
|