Changeset 179724 in webkit

Timestamp:

Feb 5, 2015, 4:53:37 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r179627. rdar://problem/19432897

Location:

branches/safari-600.1.4.15-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/table-dynamic-movement-expected.html (copied) (copied from trunk/LayoutTests/fast/multicol/table-dynamic-movement-expected.html )
• LayoutTests/fast/multicol/table-dynamic-movement.html (copied) (copied from trunk/LayoutTests/fast/multicol/table-dynamic-movement.html )
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderTable.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTable.h (modified) (1 diff)
• Source/WebCore/rendering/RenderTableRow.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderTableSection.cpp (modified) (2 diffs)

branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog

@@ +1 @@
+2015-02-05  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r179627
+
+    2015-02-03  David Hyatt  <hyatt@apple.com>
+
+            Tables don't repaginate properly when the pagination height changes or the pagination offset changes.
+            https://bugs.webkit.org/show_bug.cgi?id=141207
+            <rdar://problem/18387659>
+
+            Reviewed by Dean Jackson.
+
+            * fast/multicol/table-dynamic-movement-expected.html: Added.
+            * fast/multicol/table-dynamic-movement.html: Added.
+
+    2015-02-04  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+            When using SVG as an image, we should load datauri images when these images are not in the image cache.
+            https://bugs.webkit.org/show_bug.cgi?id=99677.
+
+            Reviewed by Darin Adler.
+
+            * svg/as-image/resources/image-with-nested-data-uri-images.svg: Added.
+            This SVG has a tree of depth = 5 of nested data URI images. All the data URI images are
+            SVG images expect the innermost one which is a png data URI image.
+
+            * svg/as-image/resources/image-with-nested-rects.svg: Added.
+            This SVG produces the same drawing as image-with-nested-data-uri-images.svg does but
+            it uses <rect> SVG elements instead.
+
+            * svg/as-image/svg-image-with-data-uri-background-expected.html: Added.
+            * svg/as-image/svg-image-with-data-uri-background.html: Added.
+            Test the data URI SVG as a css background image.
+
+            * svg/as-image/svg-image-with-data-uri-from-canvas-expected.html: Added.
+            * svg/as-image/svg-image-with-data-uri-from-canvas.html: Added.
+            Test the data URI image when it is the result of drawing an SVG image on a canvas object.
+
+            * svg/as-image/svg-image-with-data-uri-images-disabled-expected.html: Added.
+            * svg/as-image/svg-image-with-data-uri-images-disabled.html: Added.
+            Ensure the data uri images are not loaded if imagesEnabled is turned off.
+
+            * svg/as-image/svg-image-with-data-uri-reloading-expected.html: Added.
+            * svg/as-image/svg-image-with-data-uri-reloading.html: Added.
+            Test the data URI SVG when reloading the page.
+
+            * svg/as-image/svg-image-with-data-uri-use-data-uri-expected.svg: Added.
+            * svg/as-image/svg-image-with-data-uri-use-data-uri.svg: Added.
+            Test the data URI image when it is referenced from an SVG <use> tag.
+
+            * svg/as-image/svg-image-with-svg-data-uri-expected.html: Added.
+            * svg/as-image/svg-image-with-svg-data-uri.html: Added.
+            Test the data URI image when it is referenced from an HTML <img> tag.
+
 2015-02-05  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-05  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r179627
+
+    2015-02-03  David Hyatt  <hyatt@apple.com>
+
+            Tables don't repaginate properly when the pagination height changes or the pagination offset changes.
+            https://bugs.webkit.org/show_bug.cgi?id=141207
+            <rdar://problem/18387659>
+
+            Reviewed by Dean Jackson.
+
+            Added fast/multicol/table-dynamic-movement.html
+
+            Change markForPaginationRelayoutIfNeeded to be called always and to check needsLayout inside it.
+
+            Make RenderTable override markForPaginationRelayoutIfNeeded and also dirty the sections if the table
+            ended up getting marked for relayout.
+
+            Make sure rows do the right thing as well.
+
+            * rendering/RenderBlock.cpp:
+            (WebCore::RenderBlock::layoutPositionedObjects):
+            (WebCore::RenderBlock::markForPaginationRelayoutIfNeeded):
+            * rendering/RenderBlock.h:
+            * rendering/RenderBlockFlow.cpp:
+            (WebCore::RenderBlockFlow::layoutBlockChild):
+            (WebCore::RenderBlockFlow::adjustBlockChildForPagination):
+            (WebCore::RenderBlockFlow::positionNewFloats):
+            * rendering/RenderDeprecatedFlexibleBox.cpp:
+            (WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
+            (WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox):
+            * rendering/RenderTable.cpp:
+            (WebCore::RenderTable::markForPaginationRelayoutIfNeeded):
+            * rendering/RenderTable.h:
+            * rendering/RenderTableRow.cpp:
+            (WebCore::RenderTableRow::layout):
+            * rendering/RenderTableSection.cpp:
+            (WebCore::RenderTableSection::layout):
+
 2015-02-05  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlock.cpp

@@ -1433 +1433 @@
             r.setPreferredLogicalWidthsDirty(true, MarkOnlyThis);
         
-        if (!r.needsLayout())
-            r.markForPaginationRelayoutIfNeeded();
+        r.markForPaginationRelayoutIfNeeded();
         
         // We don't have to do a full layout.  We just have to update our position. Try that first. If we have shrink-to-fit width
@@ -1482 +1481 @@
 void RenderBlock::markForPaginationRelayoutIfNeeded()
 {
-    ASSERT(!needsLayout());
-    if (needsLayout())
+    if (needsLayout() || !view().layoutState()->isPaginated())
         return;
 

branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlock.h

@@ -115 +115 @@
 
     void markPositionedObjectsForLayout();
-    virtual void markForPaginationRelayoutIfNeeded() override final;
+    virtual void markForPaginationRelayoutIfNeeded() override;
     
     // FIXME-BLOCKFLOW: Remove virtualizaion when all of the line layout code has been moved out of RenderBlock

branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -706 +706 @@
     }
 
-    if (!child.needsLayout())
-        child.markForPaginationRelayoutIfNeeded();
+    child.markForPaginationRelayoutIfNeeded();
 
     bool childHadLayout = child.everHadLayout();
@@ -745 +744 @@
             if (!child.avoidsFloats() && childBlockFlow->containsFloats())
                 childBlockFlow->markAllDescendantsWithFloatsForLayout();
-            if (!child.needsLayout())
-                child.markForPaginationRelayoutIfNeeded();
+            child.markForPaginationRelayoutIfNeeded();
         }
     }
@@ -1544 +1542 @@
             if (!child.avoidsFloats() && childRenderBlock->containsFloats())
                 toRenderBlockFlow(childRenderBlock)->markAllDescendantsWithFloatsForLayout();
-            if (!child.needsLayout())
-                child.markForPaginationRelayoutIfNeeded();
+            child.markForPaginationRelayoutIfNeeded();
         }
 
@@ -2429 +2426 @@
         estimateRegionRangeForBoxChild(childBox);
 
+        childBox.markForPaginationRelayoutIfNeeded();
+        childBox.layoutIfNeeded();
+        
         LayoutState* layoutState = view().layoutState();
         bool isPaginated = layoutState->isPaginated();
-        if (isPaginated && !childBox.needsLayout())
-            childBox.markForPaginationRelayoutIfNeeded();
-        
-        childBox.layoutIfNeeded();
-
         if (isPaginated) {
             // If we are unsplittable and don't fit, then we need to move down.

branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -424 +424 @@
             child->computeAndSetBlockDirectionMargins(this);
 
-            if (!child->needsLayout())
-                child->markForPaginationRelayoutIfNeeded();
+            child->markForPaginationRelayoutIfNeeded();
             
             // Apply the child's current layout delta.
@@ -500 +499 @@
                 child->setChildNeedsLayout(MarkOnlyThis);
 
-            if (!child->needsLayout())
-                child->markForPaginationRelayoutIfNeeded();
+            child->markForPaginationRelayoutIfNeeded();
 
             layoutChildIfNeededApplyingDelta(child, childLayoutDelta);
@@ -745 +743 @@
             setHeight(height() + child->marginTop());
 
-            if (!child->needsLayout())
-                child->markForPaginationRelayoutIfNeeded();
+            child->markForPaginationRelayoutIfNeeded();
 
             // Now do a layout.

branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTable.cpp

@@ -1541 +1541 @@
 }
 
-}
+void RenderTable::markForPaginationRelayoutIfNeeded()
+{
+    if (!view().layoutState()->isPaginated() || (!view().layoutState()->pageLogicalHeightChanged() && (!view().layoutState()->pageLogicalHeight() || view().layoutState()->pageLogicalOffset(this, logicalTop()) == pageLogicalOffset())))
+        return;
+    
+    // When a table moves, we have to dirty all of the sections too.
+    if (!needsLayout())
+        setChildNeedsLayout(MarkOnlyThis);
+    for (auto& child : childrenOfType<RenderTableSection>(*this)) {
+        if (!child.needsLayout())
+            child.setChildNeedsLayout(MarkOnlyThis);
+    }
+}
+
+}

branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTable.h

@@ -276 +276 @@
     LayoutUnit offsetWidthForColumn(const RenderTableCol&) const;
     LayoutUnit offsetHeightForColumn(const RenderTableCol&) const;
-
+    
+    virtual void markForPaginationRelayoutIfNeeded() override final;
+    
 protected:
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override final;

branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableRow.cpp

@@ -169 +169 @@
                 
     for (RenderTableCell* cell = firstCell(); cell; cell = cell->nextCell()) {
-        if (!cell->needsLayout() && paginated && view().layoutState()->pageLogicalHeight() && view().layoutState()->pageLogicalOffset(cell, cell->logicalTop()) != cell->pageLogicalOffset())
+        if (!cell->needsLayout() && paginated && (view().layoutState()->pageLogicalHeightChanged() || (view().layoutState()->pageLogicalHeight() && view().layoutState()->pageLogicalOffset(cell, cell->logicalTop()) != cell->pageLogicalOffset())))
             cell->setChildNeedsLayout(MarkOnlyThis);
 

branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableSection.cpp

@@ -392 +392 @@
 
     LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
-
+    bool paginated = view().layoutState()->isPaginated();
+    
     const Vector<int>& columnPos = table()->columnPositions();
-
+    
     for (unsigned r = 0; r < m_grid.size(); ++r) {
         Row& row = m_grid[r].row;
@@ -417 +418 @@
         }
 
-        if (RenderTableRow* rowRenderer = m_grid[r].rowRenderer)
+        if (RenderTableRow* rowRenderer = m_grid[r].rowRenderer) {
+            if (!rowRenderer->needsLayout() && paginated && view().layoutState()->pageLogicalHeightChanged())
+                rowRenderer->setChildNeedsLayout(MarkOnlyThis);
+
             rowRenderer->layoutIfNeeded();
+        }
     }