| Index: sky/engine/core/rendering/RenderObject.h
|
| diff --git a/sky/engine/core/rendering/RenderObject.h b/sky/engine/core/rendering/RenderObject.h
|
| index 1f56a35cee0326ab544b8ea38c69add0616b7783..580b1b6bb0cb7ba41117ad99a2a2bd7fc3bb27c3 100644
|
| --- a/sky/engine/core/rendering/RenderObject.h
|
| +++ b/sky/engine/core/rendering/RenderObject.h
|
| @@ -309,7 +309,7 @@ public:
|
| {
|
| m_bitfields.setAncestorLineBoxDirty(value);
|
| if (value)
|
| - setNeedsLayoutAndFullPaintInvalidation();
|
| + setNeedsLayout();
|
| }
|
|
|
| // Returns the smallest rectangle enclosing all of the painted content
|
| @@ -432,7 +432,6 @@ public:
|
|
|
| void markContainingBlocksForLayout(bool scheduleRelayout = true, RenderObject* newRoot = 0, SubtreeLayoutScope* = 0);
|
| void setNeedsLayout(MarkingBehavior = MarkContainingBlockChain, SubtreeLayoutScope* = 0);
|
| - void setNeedsLayoutAndFullPaintInvalidation(MarkingBehavior = MarkContainingBlockChain, SubtreeLayoutScope* = 0);
|
| void clearNeedsLayout();
|
| void setChildNeedsLayout(MarkingBehavior = MarkContainingBlockChain, SubtreeLayoutScope* = 0);
|
| void setNeedsPositionedMovementLayout();
|
| @@ -445,11 +444,6 @@ public:
|
| setNeedsLayout();
|
| setPreferredLogicalWidthsDirty();
|
| }
|
| - void setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation()
|
| - {
|
| - setNeedsLayoutAndFullPaintInvalidation();
|
| - setPreferredLogicalWidthsDirty();
|
| - }
|
|
|
| void setPositionState(EPosition position)
|
| {
|
| @@ -919,7 +913,7 @@ inline bool RenderObject::documentBeingDestroyed() const
|
| }
|
|
|
| // setNeedsLayout() won't cause full paint invalidations as
|
| -// setNeedsLayoutAndFullPaintInvalidation() does. Otherwise the two methods are identical.
|
| +// setNeedsLayout() does. Otherwise the two methods are identical.
|
| inline void RenderObject::setNeedsLayout(MarkingBehavior markParents, SubtreeLayoutScope* layouter)
|
| {
|
| ASSERT(!isSetNeedsLayoutForbidden());
|
| @@ -931,12 +925,6 @@ inline void RenderObject::setNeedsLayout(MarkingBehavior markParents, SubtreeLay
|
| }
|
| }
|
|
|
| -// FIXME(sky): Remove this method.
|
| -inline void RenderObject::setNeedsLayoutAndFullPaintInvalidation(MarkingBehavior markParents, SubtreeLayoutScope* layouter)
|
| -{
|
| - setNeedsLayout(markParents, layouter);
|
| -}
|
| -
|
| inline void RenderObject::clearNeedsLayout()
|
| {
|
| setOnlyNeededPositionedMovementLayout(needsPositionedMovementLayoutOnly());
|
|
|