Cleanup friends of LayoutObject

The friends of LayoutObject only need to access the layout tree mutation
methods, but get access to all LayoutObject private members.

Add LayoutObject::setDangerousOneWayParent() to avoid friends.

Expose several private/protected members to public which were accessed
using friend relationship.

Review URL: https://codereview.chromium.org/1306993002

git-svn-id: svn://svn.chromium.org/blink/trunk@201265 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/layout/LayoutBlock.cpp

@@ -554,27 +554,6 @@ void LayoutBlock::makeChildrenNonInline(LayoutObject *insertionPoint)
     setShouldDoFullPaintInvalidation();
 }
 
-void LayoutBlock::promoteAllChildrenAndInsertAfter()
-{
-    LayoutObject* firstPromotee = firstChild();
-    if (!firstPromotee)
-        return;
-    LayoutObject* lastPromotee = lastChild();
-    LayoutBlock* parent = toLayoutBlock(this->parent());
-    LayoutObject* nextSiblingOfPromotees = nextSibling();
-    for (LayoutObject* o = firstPromotee; o; o = o->nextSibling())
-        o->setParent(parent);
-    children()->setFirstChild(nullptr);
-    children()->setLastChild(nullptr);
-    firstPromotee->setPreviousSibling(this);
-    setNextSibling(firstPromotee);
-    lastPromotee->setNextSibling(nextSiblingOfPromotees);
-    if (nextSiblingOfPromotees)
-        nextSiblingOfPromotees->setPreviousSibling(lastPromotee);
-    if (parent->children()->lastChild() == this)
-        parent->children()->setLastChild(lastPromotee);
-}
-
 void LayoutBlock::removeLeftoverAnonymousBlock(LayoutBlock* child)
 {
     ASSERT(child->isAnonymousBlock());
@@ -587,7 +566,7 @@ void LayoutBlock::removeLeftoverAnonymousBlock(LayoutBlock* child)
     // Promote all the leftover anonymous block's children (to become children of this block
     // instead). We still want to keep the leftover block in the tree for a moment, for notification
     // purposes done further below (flow threads and grids).
-    child->promoteAllChildrenAndInsertAfter();
+    child->moveAllChildrenTo(this, child->nextSibling());
 
     // Remove all the information in the flow thread associated with the leftover anonymous block.
     child->removeFromLayoutFlowThread();
@@ -2785,7 +2764,7 @@ static bool recalcNormalFlowChildOverflowIfNeeded(LayoutObject* layoutObject)
 bool LayoutBlock::recalcChildOverflowAfterStyleChange()
 {
     ASSERT(childNeedsOverflowRecalcAfterStyleChange());
-    setChildNeedsOverflowRecalcAfterStyleChange(false);
+    clearChildNeedsOverflowRecalcAfterStyleChange();
 
     bool childrenOverflowChanged = false;
 
@@ -2841,7 +2820,7 @@ bool LayoutBlock::recalcOverflowAfterStyleChange()
     if (!selfNeedsOverflowRecalcAfterStyleChange() && !childrenOverflowChanged)
         return false;
 
-    setSelfNeedsOverflowRecalcAfterStyleChange(false);
+    clearSelfNeedsOverflowRecalcAfterStyleChange();
     // If the current block needs layout, overflow will be recalculated during
     // layout time anyway. We can safely exit here.
     if (needsLayout())

third_party/WebKit/Source/core/layout/LayoutBlock.h

@@ -308,9 +308,6 @@ private:
 
     void makeChildrenNonInline(LayoutObject* insertionPoint = nullptr);
 
-    // Promote all children and make them siblings that come right after this block.
-    void promoteAllChildrenAndInsertAfter();
-
     virtual void removeLeftoverAnonymousBlock(LayoutBlock* child);
 
     static void collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* child);

third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

@@ -315,7 +315,7 @@ void LayoutBlockFlow::layoutBlock(bool relayoutChildren)
             hasVisibleContent = layer->hasVisibleContent();
         }
         if (hasVisibleContent)
-            setShouldInvalidateOverflowForPaint(true);
+            setShouldInvalidateOverflowForPaint();
     }
 
     if (isHTMLDialogElement(node()) && isOutOfFlowPositioned())
@@ -386,7 +386,7 @@ inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit &
     }
 
     if (shouldBreakAtLineToAvoidWidow()) {
-        setEverHadLayout(true);
+        setEverHadLayout();
         return false;
     }
 

third_party/WebKit/Source/core/layout/LayoutObject.cpp

@@ -361,6 +361,14 @@ void LayoutObject::removeChild(LayoutObject* oldChild)
     children->removeChildNode(this, oldChild);
 }
 
+void LayoutObject::setDangerousOneWayParent(LayoutObject* parent)
+{
+    ASSERT(!previousSibling());
+    ASSERT(!nextSibling());
+    ASSERT(!parent || !m_parent);
+    setParent(parent);
+}
+
 void LayoutObject::registerSubtreeChangeListenerOnDescendants(bool value)
 {
     // If we're set to the same value then we're done as that means it's
@@ -1762,13 +1770,13 @@ void LayoutObject::firstLineStyleDidChange(const ComputedStyle& oldStyle, const
 void LayoutObject::markContainingBlocksForOverflowRecalc()
 {
     for (LayoutBlock* container = containingBlock(); container && !container->childNeedsOverflowRecalcAfterStyleChange(); container = container->containingBlock())
-        container->setChildNeedsOverflowRecalcAfterStyleChange(true);
+        container->setChildNeedsOverflowRecalcAfterStyleChange();
 }
 
 void LayoutObject::setNeedsOverflowRecalcAfterStyleChange()
 {
     bool neededRecalc = needsOverflowRecalcAfterStyleChange();
-    setSelfNeedsOverflowRecalcAfterStyleChange(true);
+    setSelfNeedsOverflowRecalcAfterStyleChange();
     if (!neededRecalc)
         markContainingBlocksForOverflowRecalc();
 }

third_party/WebKit/Source/core/layout/LayoutObject.h

@@ -117,10 +117,6 @@ const int showTreeCharacterOffset = 39;
 
 // Base class for all layout tree objects.
 class CORE_EXPORT LayoutObject : public ImageResourceClient {
-    friend class LayoutBlock;
-    friend class LayoutBlockFlow;
-    friend class DeprecatedPaintLayerReflectionInfo; // For setParent
-    friend class DeprecatedPaintLayerScrollableArea; // For setParent.
     friend class LayoutObjectChildList;
     WTF_MAKE_NONCOPYABLE(LayoutObject);
 public:
@@ -265,7 +261,10 @@ public:
     virtual bool createsAnonymousWrapper() const { return false; }
     //////////////////////////////////////////
 
-protected:
+    // Sets the parent of this object but doesn't add it as a child of the parent.
+    void setDangerousOneWayParent(LayoutObject*);
+
+private:
     //////////////////////////////////////////
     // Helper functions. Dangerous to use!
     void setPreviousSibling(LayoutObject* previous) { m_previous = previous; }
@@ -1053,6 +1052,9 @@ public:
     // FIXME: should we hook up scrollbar parts in the layout tree? crbug.com/484263.
     void invalidateDisplayItemClientForNonCompositingDescendantsOf(const LayoutObject&) const;
 
+    // Called before anonymousChild.setStyle(). Override to set custom styles for the child.
+    virtual void updateAnonymousChildStyle(const LayoutObject& anonymousChild, ComputedStyle& style) const { }
+
 protected:
     enum LayoutObjectType {
         LayoutObjectBr,
@@ -1133,7 +1135,6 @@ protected:
     // time this function is called.
     virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle);
     void propagateStyleToAnonymousChildren(bool blockChildrenOnly = false);
-    virtual void updateAnonymousChildStyle(const LayoutObject& child, ComputedStyle& style) const { }
 
 protected:
     virtual void willBeDestroyed();
@@ -1183,6 +1184,14 @@ protected:
 
     void setIsSlowRepaintObject(bool);
 
+    void clearSelfNeedsOverflowRecalcAfterStyleChange() { m_bitfields.setSelfNeedsOverflowRecalcAfterStyleChange(false); }
+    void clearChildNeedsOverflowRecalcAfterStyleChange() { m_bitfields.setChildNeedsOverflowRecalcAfterStyleChange(false); }
+    void setShouldInvalidateOverflowForPaint() { m_bitfields.setShouldInvalidateOverflowForPaint(true); }
+    void setEverHadLayout() { m_bitfields.setEverHadLayout(true); }
+
+    // Remove this object and all descendants from the containing LayoutFlowThread.
+    void removeFromLayoutFlowThread();
+
 private:
     const LayoutRect& previousPaintInvalidationRect() const { return m_previousPaintInvalidationRect; }
 
@@ -1222,7 +1231,6 @@ private:
     const LayoutBoxModelObject* enclosingCompositedContainer() const;
 
     LayoutFlowThread* locateFlowThreadContainingBlock() const;
-    void removeFromLayoutFlowThread();
     void removeFromLayoutFlowThreadRecursive(LayoutFlowThread*);
 
     ComputedStyle* cachedFirstLineStyle() const;
@@ -1410,10 +1418,9 @@ private:
     void setPosChildNeedsLayout(bool b) { m_bitfields.setPosChildNeedsLayout(b); }
     void setNeedsSimplifiedNormalFlowLayout(bool b) { m_bitfields.setNeedsSimplifiedNormalFlowLayout(b); }
     void setIsDragging(bool b) { m_bitfields.setIsDragging(b); }
-    void setEverHadLayout(bool b) { m_bitfields.setEverHadLayout(b); }
-    void setShouldInvalidateOverflowForPaint(bool b) { m_bitfields.setShouldInvalidateOverflowForPaint(b); }
-    void setSelfNeedsOverflowRecalcAfterStyleChange(bool b) { m_bitfields.setSelfNeedsOverflowRecalcAfterStyleChange(b); }
-    void setChildNeedsOverflowRecalcAfterStyleChange(bool b) { m_bitfields.setChildNeedsOverflowRecalcAfterStyleChange(b); }
+    void clearShouldInvalidateOverflowForPaint() { m_bitfields.setShouldInvalidateOverflowForPaint(false); }
+    void setSelfNeedsOverflowRecalcAfterStyleChange() { m_bitfields.setSelfNeedsOverflowRecalcAfterStyleChange(true); }
+    void setChildNeedsOverflowRecalcAfterStyleChange() { m_bitfields.setChildNeedsOverflowRecalcAfterStyleChange(true); }
 
 private:
     // Store state between styleWillChange and styleDidChange
@@ -1512,7 +1519,7 @@ inline void LayoutObject::setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidat
 inline void LayoutObject::clearNeedsLayout()
 {
     // Set flags for later stages/cycles.
-    setEverHadLayout(true);
+    setEverHadLayout();
     setMayNeedPaintInvalidation();
     m_bitfields.setNeededLayoutBecauseOfChildren(needsLayoutBecauseOfChildren());
 

third_party/WebKit/Source/core/paint/DeprecatedPaintLayerReflectionInfo.cpp

@@ -63,7 +63,7 @@ DeprecatedPaintLayerReflectionInfo::DeprecatedPaintLayerReflectionInfo(LayoutBox
     UseCounter::count(box().document(), UseCounter::Reflection);
 
     m_reflection = LayoutReplica::createAnonymous(&box().document());
-    m_reflection->setParent(m_box); // We create a 1-way connection.
+    m_reflection->setDangerousOneWayParent(m_box);
 }
 
 void DeprecatedPaintLayerReflectionInfo::destroy()
@@ -71,7 +71,7 @@ void DeprecatedPaintLayerReflectionInfo::destroy()
     if (!m_reflection->documentBeingDestroyed())
         m_reflection->removeLayers(box().layer());
 
-    m_reflection->setParent(0);
+    m_reflection->setDangerousOneWayParent(nullptr);
     m_reflection->destroy();
     m_reflection = nullptr;
 }

third_party/WebKit/Source/core/paint/DeprecatedPaintLayerScrollableArea.cpp

@@ -1136,7 +1136,7 @@ void DeprecatedPaintLayerScrollableArea::updateScrollCornerStyle()
     if (corner) {
         if (!m_scrollCorner) {
             m_scrollCorner = LayoutScrollbarPart::createAnonymous(&box().document());
-            m_scrollCorner->setParent(&box());
+            m_scrollCorner->setDangerousOneWayParent(&box());
         }
         m_scrollCorner->setStyle(corner.release());
     } else if (m_scrollCorner) {
@@ -1264,7 +1264,7 @@ void DeprecatedPaintLayerScrollableArea::updateResizerStyle()
     if (resizer) {
         if (!m_resizer) {
             m_resizer = LayoutScrollbarPart::createAnonymous(&box().document());
-            m_resizer->setParent(&box());
+            m_resizer->setDangerousOneWayParent(&box());
         }
         m_resizer->setStyle(resizer.release());
     } else if (m_resizer) {