Changeset 136908 in webkit

Timestamp:

Dec 6, 2012 4:33:56 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Regions] Remove the sanitize mechanism from LineFragmentationData
​https://bugs.webkit.org/show_bug.cgi?id=104234

Patch by Andrei Bucur <​abucur@adobe.com> on 2012-12-06
Reviewed by David Hyatt.

Remove previous work that ensured an invalid region is never returned by the containingRegion getter. After r136793 the blocks always
relayout children if the region chain changes. This means the sanitize() method is only necessary when all the regions are removed.
This case is treated separately in layoutInlineChildren.

Tests: no new functionality, no bug fixed.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::lineWidthForPaginatedLineChanged):

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::layoutInlineChildren):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::containingRegion):
(WebCore):
(WebCore::RootInlineBox::setContainingRegion):

• rendering/RootInlineBox.h:

(RootInlineBox):
(WebCore::RootInlineBox::LineFragmentationData::LineFragmentationData):
(LineFragmentationData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (1 diff)
• rendering/RootInlineBox.cpp (modified) (2 diffs)
• rendering/RootInlineBox.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-06  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] Remove the sanitize mechanism from LineFragmentationData
+        https://bugs.webkit.org/show_bug.cgi?id=104234
+
+        Reviewed by David Hyatt.
+
+        Remove previous work that ensured an invalid region is never returned by the containingRegion getter. After r136793 the blocks always
+        relayout children if the region chain changes. This means the sanitize() method is only necessary when all the regions are removed.
+        This case is treated separately in layoutInlineChildren.
+
+        Tests: no new functionality, no bug fixed.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::lineWidthForPaginatedLineChanged):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::containingRegion):
+        (WebCore):
+        (WebCore::RootInlineBox::setContainingRegion):
+        * rendering/RootInlineBox.h:
+        (RootInlineBox):
+        (WebCore::RootInlineBox::LineFragmentationData::LineFragmentationData):
+        (LineFragmentationData):
+
 2012-12-06  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -7252 +7252 @@
 
     RenderRegion* currentRegion = regionAtBlockOffset(rootBox->lineTopWithLeading() + lineDelta);
-    // Just bail if we still don't have a region.
-    if (!rootBox->hasContainingRegion() && !currentRegion)
-        return false;
     // Just bail if the region didn't change.
-    if (rootBox->hasContainingRegion() && rootBox->containingRegion() == currentRegion)
+    if (rootBox->containingRegion() == currentRegion)
         return false;
     return rootBox->paginatedLineWidth() != availableLogicalWidthForContent(currentRegion, offsetFromLogicalTopOfFirstPage());

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1745 +1745 @@
         layoutLineGridBox();
 
+    bool clearLinesForPagination = firstLineBox() && inRenderFlowThread() && !enclosingRenderFlowThread()->hasRegions();
+
     // Figure out if we should clear out our line boxes.
     // FIXME: Handle resize eventually!
-    bool isFullLayout = !firstLineBox() || selfNeedsLayout() || relayoutChildren;
+    bool isFullLayout = !firstLineBox() || selfNeedsLayout() || relayoutChildren || clearLinesForPagination;
     LineLayoutState layoutState(isFullLayout, repaintLogicalTop, repaintLogicalBottom);
 

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -251 +251 @@
 }
 
+RenderRegion* RootInlineBox::containingRegion() const
+{
+    RenderRegion* region = m_fragmentationData ? m_fragmentationData->m_containingRegion : 0;
+
+#ifndef NDEBUG
+    if (region) {
+        RenderFlowThread* flowThread = block()->enclosingRenderFlowThread();
+        const RenderRegionList& regionList = flowThread->renderRegionList();
+        ASSERT(regionList.contains(region));
+    }
+#endif
+
+    return region;
+}
+
 void RootInlineBox::setContainingRegion(RenderRegion* region)
 {
@@ -257 +272 @@
     LineFragmentationData* fragmentationData  = ensureLineFragmentationData();
     fragmentationData->m_containingRegion = region;
-    fragmentationData->m_hasContainingRegion = !!region;
-}
-
-RootInlineBox::LineFragmentationData* RootInlineBox::LineFragmentationData::sanitize(const RenderBlock* block)
-{
-    ASSERT(block->inRenderFlowThread());
-    if (!m_containingRegion)
-        return this;
-
-    RenderFlowThread* flowThread = block->enclosingRenderFlowThread();
-    const RenderRegionList& regionList = flowThread->renderRegionList();
-    // For pointer types the hash function is |safeToCompareToEmptyOrDeleted|. There shouldn't be any problems if m_containingRegion was deleted.
-    if (!regionList.contains(m_containingRegion))
-        m_containingRegion = 0;
-
-    return this;
 }
 

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -64 +64 @@
     void setPaginatedLineWidth(LayoutUnit width) { ensureLineFragmentationData()->m_paginatedLineWidth = width; }
 
-    RenderRegion* containingRegion() const { return m_fragmentationData ? m_fragmentationData->sanitize(block())->m_containingRegion : 0; }
-    bool hasContainingRegion() const { return m_fragmentationData ? m_fragmentationData->m_hasContainingRegion : false; }
+    RenderRegion* containingRegion() const;
     void setContainingRegion(RenderRegion*);
 
@@ -230 +229 @@
             , m_paginatedLineWidth(0)
             , m_isFirstAfterPageBreak(false)
-            , m_hasContainingRegion(false)
         {
 
         }
 
-        LineFragmentationData* sanitize(const RenderBlock*);
-
         // It should not be assumed the |containingRegion| is always valid.
-        // It can also be 0 if the flow has no region chain or an invalid pointer if the region is no longer in the chain.
-        // Use |sanitize| to filter an invalid region.
+        // It can also be 0 if the flow has no region chain.
         RenderRegion* m_containingRegion;
         LayoutUnit m_paginationStrut;
         LayoutUnit m_paginatedLineWidth;
-        unsigned m_isFirstAfterPageBreak : 1;
-        unsigned m_hasContainingRegion : 1; // We need to keep this to differentiate between the case of a void region and an invalid region.
+        bool m_isFirstAfterPageBreak;
     };