Title: [275931] trunk
Revision
275931
Author
[email protected]
Date
2021-04-13 22:34:26 -0700 (Tue, 13 Apr 2021)

Log Message

Table caption jumps to the bottom of the table after simplified table relayout
https://bugs.webkit.org/show_bug.cgi?id=187903
<rdar://problem/42506245>

Reviewed by Zalan Bujtas.

Source/WebCore:

Test: fast/table/caption-simplified-layout.html

* rendering/RenderTable.cpp:
(WebCore::RenderTable::simplifiedNormalFlowLayout):
Do not call layoutCaptions().

LayoutTests:

* fast/table/caption-simplified-layout-expected.html: Added.
* fast/table/caption-simplified-layout.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (275930 => 275931)


--- trunk/LayoutTests/ChangeLog	2021-04-14 05:24:43 UTC (rev 275930)
+++ trunk/LayoutTests/ChangeLog	2021-04-14 05:34:26 UTC (rev 275931)
@@ -1,3 +1,14 @@
+2021-04-13  Fujii Hironori  <[email protected]>
+
+        Table caption jumps to the bottom of the table after simplified table relayout
+        https://bugs.webkit.org/show_bug.cgi?id=187903
+        <rdar://problem/42506245>
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/table/caption-simplified-layout-expected.html: Added.
+        * fast/table/caption-simplified-layout.html: Added.
+
 2021-04-13  Diego Pino Garcia  <[email protected]>
 
         [GTK] Unreviewed test gardening. Update baselines after r275515.

Added: trunk/LayoutTests/fast/table/caption-simplified-layout-expected.html (0 => 275931)


--- trunk/LayoutTests/fast/table/caption-simplified-layout-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/table/caption-simplified-layout-expected.html	2021-04-14 05:34:26 UTC (rev 275931)
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <style>
+            .a {
+                transform: rotate(10deg);
+            }
+        </style>
+    </head>
+    <body>
+        Top captions should be placed above the table even ater the simplified table relayout.
+        <table border=3>
+            <caption>top caption 1</caption>
+            <caption>top caption 2</caption>
+            <caption align=bottom>bottom caption 1</caption>
+            <caption align=bottom>bottom caption 2</caption>
+            <tr>
+                <th>Apple</th>
+                <th>Banana</th>
+                <th>Orange</th>
+            </tr>
+            <tr>
+                <td><div class=a>text</div></td>
+                <td><div class=a>text</div></td>
+                <td><div class=a>text</div></td>
+            </tr>
+        </table>
+    </body>
+</html>

Added: trunk/LayoutTests/fast/table/caption-simplified-layout.html (0 => 275931)


--- trunk/LayoutTests/fast/table/caption-simplified-layout.html	                        (rev 0)
+++ trunk/LayoutTests/fast/table/caption-simplified-layout.html	2021-04-14 05:34:26 UTC (rev 275931)
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <style>
+            .a {
+                transform: rotate(5deg);
+            }
+            .x .a {
+                transform: rotate(10deg);
+            }
+        </style>
+        <script>
+            if (window.testRunner)
+                testRunner.waitUntilDone();
+            _onload_ = () => {
+                setTimeout(() => {
+                    document.body.className = 'x';
+                    if (window.testRunner)
+                        testRunner.notifyDone();
+                }, 100)
+            }
+        </script>
+    </head>
+    <body>
+        Top captions should be placed above the table even ater the simplified table relayout.
+        <table border=3>
+            <caption>top caption 1</caption>
+            <caption>top caption 2</caption>
+            <caption align=bottom>bottom caption 1</caption>
+            <caption align=bottom>bottom caption 2</caption>
+            <tr>
+                <th>Apple</th>
+                <th>Banana</th>
+                <th>Orange</th>
+            </tr>
+            <tr>
+                <td><div class=a>text</div></td>
+                <td><div class=a>text</div></td>
+                <td><div class=a>text</div></td>
+            </tr>
+        </table>
+    </body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (275930 => 275931)


--- trunk/Source/WebCore/ChangeLog	2021-04-14 05:24:43 UTC (rev 275930)
+++ trunk/Source/WebCore/ChangeLog	2021-04-14 05:34:26 UTC (rev 275931)
@@ -1,3 +1,17 @@
+2021-04-13  Fujii Hironori  <[email protected]>
+
+        Table caption jumps to the bottom of the table after simplified table relayout
+        https://bugs.webkit.org/show_bug.cgi?id=187903
+        <rdar://problem/42506245>
+
+        Reviewed by Zalan Bujtas.
+
+        Test: fast/table/caption-simplified-layout.html
+
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::simplifiedNormalFlowLayout):
+        Do not call layoutCaptions().
+
 2021-04-13  Myles C. Maxfield  <[email protected]>
 
         [GPU Process] Simplify DisplayList::Iterator part 4: Move DisplayList::Iterator to its own .h/.cpp files

Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (275930 => 275931)


--- trunk/Source/WebCore/rendering/RenderTable.cpp	2021-04-14 05:24:43 UTC (rev 275930)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp	2021-04-14 05:34:26 UTC (rev 275931)
@@ -415,12 +415,10 @@
 
 void RenderTable::simplifiedNormalFlowLayout()
 {
-    layoutCaptions();
     for (RenderTableSection* section = topSection(); section; section = sectionBelow(section)) {
         section->layoutIfNeeded();
         section->computeOverflowFromCells();
     }
-    layoutCaptions(BottomCaptionLayoutPhase::Yes);
 }
 
 void RenderTable::layout()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to