Changeset 205927 in webkit

Timestamp:

Sep 14, 2016, 1:51:41 PM (9 years ago)

Author:

Antti Koivisto

Message:

Move more code out from RenderObject
​https://bugs.webkit.org/show_bug.cgi?id=161980

Reviewed by Zalan Bujtas.

Move some functions that are only needed for RenderElement there.
Move collapsing anonymous table rows to RenderTableRow.

• rendering/RenderElement.cpp:

(WebCore::RenderElement::hasOutlineAnnotation):
(WebCore::RenderElement::hasSelfPaintingLayer):
(WebCore::RenderElement::checkForRepaintDuringLayout):

• rendering/RenderElement.h:

(WebCore::RenderElement::hasOutline):
(WebCore::RenderElement::hasHiddenBackface): Deleted.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::rootOrBodyStyleChanged):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::pixelSnappedAbsoluteClippedOverflowRect):
(WebCore::RenderObject::destroyAndCleanupAnonymousWrappers):
(WebCore::RenderObject::hasSelfPaintingLayer): Deleted.
(WebCore::RenderObject::checkForRepaintDuringLayout): Deleted.
(WebCore::RenderObject::hasOutlineAnnotation): Deleted.
(WebCore::RenderObject::hasEntirelyFixedBackground): Deleted.
(WebCore::collapseAnonymousTableRowsIfNeeded): Deleted.

• rendering/RenderObject.h:

(WebCore::RenderObject::hasLayer):
(WebCore::RenderObject::canBeSelectionLeaf):
(WebCore::RenderObject::hasOutline): Deleted.
(WebCore::RenderObject::hasSelectedChildren): Deleted.

• rendering/RenderTableRow.cpp:

(WebCore::RenderTableRow::destroyAndCollapseAnonymousSiblingRows):

• rendering/RenderTableRow.h:
• rendering/RenderView.cpp:

(WebCore::RenderView::rootBackgroundIsEntirelyFixed):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (1 diff)
• rendering/RenderElement.h (modified) (2 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (5 diffs)
• rendering/RenderObject.h (modified) (5 diffs)
• rendering/RenderTableRow.cpp (modified) (1 diff)
• rendering/RenderTableRow.h (modified) (1 diff)
• rendering/RenderView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-14  Antti Koivisto  <antti@apple.com>
+
+        Move more code out from RenderObject
+        https://bugs.webkit.org/show_bug.cgi?id=161980
+
+        Reviewed by Zalan Bujtas.
+
+        Move some functions that are only needed for RenderElement there.
+        Move collapsing anonymous table rows to RenderTableRow.
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::hasOutlineAnnotation):
+        (WebCore::RenderElement::hasSelfPaintingLayer):
+        (WebCore::RenderElement::checkForRepaintDuringLayout):
+        * rendering/RenderElement.h:
+        (WebCore::RenderElement::hasOutline):
+        (WebCore::RenderElement::hasHiddenBackface): Deleted.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::rootOrBodyStyleChanged):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::pixelSnappedAbsoluteClippedOverflowRect):
+        (WebCore::RenderObject::destroyAndCleanupAnonymousWrappers):
+        (WebCore::RenderObject::hasSelfPaintingLayer): Deleted.
+        (WebCore::RenderObject::checkForRepaintDuringLayout): Deleted.
+        (WebCore::RenderObject::hasOutlineAnnotation): Deleted.
+        (WebCore::RenderObject::hasEntirelyFixedBackground): Deleted.
+        (WebCore::collapseAnonymousTableRowsIfNeeded): Deleted.
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::hasLayer):
+        (WebCore::RenderObject::canBeSelectionLeaf):
+        (WebCore::RenderObject::hasOutline): Deleted.
+        (WebCore::RenderObject::hasSelectedChildren): Deleted.
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::destroyAndCollapseAnonymousSiblingRows):
+        * rendering/RenderTableRow.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::rootBackgroundIsEntirelyFixed):
+
 2016-09-14  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -2174 +2174 @@
 }
 
+bool RenderElement::hasOutlineAnnotation() const
+{
+    return element() && element()->isLink() && document().printing();
+}
+
+bool RenderElement::hasSelfPaintingLayer() const
+{
+    if (!hasLayer())
+        return false;
+    auto& layerModelObject = downcast<RenderLayerModelObject>(*this);
+    return layerModelObject.hasSelfPaintingLayer();
+}
+
+bool RenderElement::checkForRepaintDuringLayout() const
+{
+    return !document().view()->needsFullRepaint() && everHadLayout() && !hasSelfPaintingLayer();
+}
+
 #if ENABLE(IOS_TEXT_AUTOSIZING)
 static RenderObject::BlockContentHeightType includeNonFixedHeight(const RenderObject& renderer)

trunk/Source/WebCore/rendering/RenderElement.h

@@ -162 +162 @@
     bool hasClipPath() const { return style().clipPath(); }
     bool hasHiddenBackface() const { return style().backfaceVisibility() == BackfaceVisibilityHidden; }
+    bool hasOutlineAnnotation() const;
+    bool hasOutline() const { return style().hasOutline() || hasOutlineAnnotation(); }
+    bool hasSelfPaintingLayer() const;
+
+    bool checkForRepaintDuringLayout() const;
 
     // anchorRect() is conceptually similar to absoluteBoundingBoxRect(), but is intended for scrolling to an anchor.
@@ -177 +182 @@
 #endif
     }
+
 
 #if ENABLE(CSS_COMPOSITING)

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -3234 +3234 @@
 
     bool hadFixedBackground = oldStyle && oldStyle->hasEntirelyFixedBackground();
-    if (hadFixedBackground != renderer.hasEntirelyFixedBackground()) {
+    if (hadFixedBackground != renderer.style().hasEntirelyFixedBackground()) {
         setCompositingLayersNeedRebuild();
         scheduleCompositingLayerUpdate();

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -63 +63 @@
 #include "RenderScrollbarPart.h"
 #include "RenderTableRow.h"
-#include "RenderTableSection.h"
 #include "RenderTheme.h"
 #include "RenderView.h"
@@ -908 +907 @@
     return snappedIntRect(absoluteClippedOverflowRect());
 }
-
-bool RenderObject::hasSelfPaintingLayer() const
-{
-    if (!hasLayer())
-        return false;
-    auto* layer = downcast<RenderLayerModelObject>(*this).layer();
-    if (!layer)
-        return false;
-    return layer->isSelfPaintingLayer();
-}
     
-bool RenderObject::checkForRepaintDuringLayout() const
-{
-    return !document().view()->needsFullRepaint() && everHadLayout() && !hasSelfPaintingLayer();
-}
-
 LayoutRect RenderObject::rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const
 {
@@ -1375 +1359 @@
 }
 
-bool RenderObject::hasOutlineAnnotation() const
-{
-    return node() && node()->isLink() && document().printing();
-}
-
-bool RenderObject::hasEntirelyFixedBackground() const
-{
-    return style().hasEntirelyFixedBackground();
-}
-
 static inline RenderElement* containerForElement(const RenderObject& renderer, const RenderLayerModelObject* repaintContainer, bool* repaintContainerSkipped)
 {
@@ -1539 +1513 @@
 }
 
-static void collapseAnonymousTableRowsIfNeeded(const RenderObject& rendererToBeDestroyed)
-{
-    if (!is<RenderTableRow>(rendererToBeDestroyed))
-        return;
-
-    auto& rowToBeDestroyed = downcast<RenderTableRow>(rendererToBeDestroyed);
-    auto* section = downcast<RenderTableSection>(rowToBeDestroyed.parent());
-    if (!section)
-        return;
-
-    // All siblings generated?
-    for (auto* current = section->firstRow(); current; current = current->nextRow()) {
-        if (current == &rendererToBeDestroyed)
-            continue;
-        if (!current->isAnonymous())
-            return;
-    }
-
-    RenderTableRow* rowToInsertInto = nullptr;
-    auto* currentRow = section->firstRow();
-    while (currentRow) {
-        if (currentRow == &rendererToBeDestroyed) {
-            currentRow = currentRow->nextRow();
-            continue;
-        }
-        if (!rowToInsertInto) {
-            rowToInsertInto = currentRow;
-            currentRow = currentRow->nextRow();
-            continue;
-        }
-        currentRow->moveAllChildrenTo(rowToInsertInto);
-        auto* destroyThis = currentRow;
-        currentRow = currentRow->nextRow();
-        destroyThis->destroy();
-    }
-    if (rowToInsertInto)
-        rowToInsertInto->setNeedsLayout();
-}
-
 void RenderObject::destroyAndCleanupAnonymousWrappers()
 {
@@ -1598 +1533 @@
         destroyRootParent = destroyRootParent->parent();
     }
-    collapseAnonymousTableRowsIfNeeded(*destroyRoot);
+
+    if (is<RenderTableRow>(*destroyRoot)) {
+        downcast<RenderTableRow>(*destroyRoot).destroyAndCollapseAnonymousSiblingRows();
+        return;
+    }
+
     destroyRoot->destroy();
     // WARNING: |this| is deleted here.

trunk/Source/WebCore/rendering/RenderObject.h

@@ -462 +462 @@
 
     bool hasLayer() const { return m_bitfields.hasLayer(); }
-    bool hasSelfPaintingLayer() const;
 
     enum BoxDecorationState {
@@ -472 +471 @@
     bool hasVisibleBoxDecorations() const { return m_bitfields.boxDecorationState() != NoBoxDecorations; }
     bool backgroundIsKnownToBeObscured(const LayoutPoint& paintOffset);
-    bool hasEntirelyFixedBackground() const;
 
     bool needsLayout() const
@@ -520 +518 @@
     Document& document() const { return m_node.document(); }
     Frame& frame() const;
-
-    bool hasOutlineAnnotation() const;
-    bool hasOutline() const { return style().hasOutline() || hasOutlineAnnotation(); }
 
     // Returns the object containing this one. Can be different from parent for positioned elements.
@@ -677 +672 @@
     // Repaint a slow repaint object, which, at this time, means we are repainting an object with background-attachment:fixed.
     void repaintSlowRepaintObject() const;
-
-    bool checkForRepaintDuringLayout() const;
 
     // Returns the rect that should be repainted whenever this object changes.  The rect is in the view's
@@ -736 +729 @@
 
     virtual bool canBeSelectionLeaf() const { return false; }
-    bool hasSelectedChildren() const { return selectionState() != SelectionNone; }
 
     // Whether or not a given block needs to paint selection gaps.

trunk/Source/WebCore/rendering/RenderTableRow.cpp

@@ -273 +273 @@
 }
 
+void RenderTableRow::destroyAndCollapseAnonymousSiblingRows()
+{
+    auto collapseAnonymousSiblingRows = [&] {
+        auto* section = this->section();
+        if (!section)
+            return;
+
+        // All siblings generated?
+        for (auto* current = section->firstRow(); current; current = current->nextRow()) {
+            if (current == this)
+                continue;
+            if (!current->isAnonymous())
+                return;
+        }
+
+        RenderTableRow* rowToInsertInto = nullptr;
+        auto* currentRow = section->firstRow();
+        while (currentRow) {
+            if (currentRow == this) {
+                currentRow = currentRow->nextRow();
+                continue;
+            }
+            if (!rowToInsertInto) {
+                rowToInsertInto = currentRow;
+                currentRow = currentRow->nextRow();
+                continue;
+            }
+            currentRow->moveAllChildrenTo(rowToInsertInto);
+            auto* destroyThis = currentRow;
+            currentRow = currentRow->nextRow();
+            destroyThis->destroy();
+        }
+        if (rowToInsertInto)
+            rowToInsertInto->setNeedsLayout();
+    };
+
+    collapseAnonymousSiblingRows();
+    destroy();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderTableRow.h

@@ -63 +63 @@
 
     bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
+
+    void destroyAndCollapseAnonymousSiblingRows();
 
 private:

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -1138 +1138 @@
         return false;
 
-    return rootObject->rendererForRootBackground().hasEntirelyFixedBackground();
+    return rootObject->rendererForRootBackground().style().hasEntirelyFixedBackground();
 }