<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[277546] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/277546">277546</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-05-15 13:22:37 -0700 (Sat, 15 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC] Move table formatting quirks to its own class
https://bugs.webkit.org/show_bug.cgi?id=225758

Reviewed by Antti Koivisto.

* Sources.txt:
* WebCore.xcodeproj/project.pbxproj:
* layout/formattingContexts/table/TableFormattingContext.cpp:
(WebCore::Layout::TableFormattingContext::quirks const):
* layout/formattingContexts/table/TableFormattingContext.h:
(WebCore::Layout::TableFormattingContext::Quirks::Quirks): Deleted.
* layout/formattingContexts/table/TableFormattingContextQuirks.cpp: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreSourcestxt">trunk/Source/WebCore/Sources.txt</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextstableTableFormattingContextcpp">trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextstableTableFormattingContexth">trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorelayoutformattingContextstableTableFormattingQuirkscpp">trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextstableTableFormattingQuirksh">trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.h</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorelayoutformattingContextstableTableFormattingContextQuirkscpp">trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContextQuirks.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (277545 => 277546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-15 19:50:54 UTC (rev 277545)
+++ trunk/Source/WebCore/ChangeLog      2021-05-15 20:22:37 UTC (rev 277546)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2021-05-15  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [LFC] Move table formatting quirks to its own class
+        https://bugs.webkit.org/show_bug.cgi?id=225758
+
+        Reviewed by Antti Koivisto.
+
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * layout/formattingContexts/table/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::quirks const):
+        * layout/formattingContexts/table/TableFormattingContext.h:
+        (WebCore::Layout::TableFormattingContext::Quirks::Quirks): Deleted.
+        * layout/formattingContexts/table/TableFormattingContextQuirks.cpp: Removed.
+
+2021-05-15  Alan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC] Move inline formatting quirks to its own class
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=225759
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreSourcestxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Sources.txt (277545 => 277546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Sources.txt 2021-05-15 19:50:54 UTC (rev 277545)
+++ trunk/Source/WebCore/Sources.txt    2021-05-15 20:22:37 UTC (rev 277546)
</span><span class="lines">@@ -1563,7 +1563,7 @@
</span><span class="cx"> layout/layouttree/LayoutTreeBuilder.cpp
</span><span class="cx"> layout/formattingContexts/table/TableFormattingContext.cpp
</span><span class="cx"> layout/formattingContexts/table/TableFormattingContextGeometry.cpp
</span><del>-layout/formattingContexts/table/TableFormattingContextQuirks.cpp
</del><ins>+layout/formattingContexts/table/TableFormattingQuirks.cpp
</ins><span class="cx"> layout/formattingContexts/table/TableFormattingState.cpp
</span><span class="cx"> layout/formattingContexts/table/TableGrid.cpp
</span><span class="cx"> layout/formattingContexts/table/TableLayout.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (277545 => 277546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj   2021-05-15 19:50:54 UTC (rev 277545)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj      2021-05-15 20:22:37 UTC (rev 277546)
</span><span class="lines">@@ -2135,6 +2135,7 @@
</span><span class="cx">          6F360E5023999421001512A7 /* InlineSoftLineBreakItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F360E4E23999420001512A7 /* InlineSoftLineBreakItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          6F3FBA982556E313003530FD /* LayoutIntegrationInlineContentBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F3FBA972556E312003530FD /* LayoutIntegrationInlineContentBuilder.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          6F40DA822513033A00EC04B7 /* InlineRect.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F40DA812513033A00EC04B7 /* InlineRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+               6F49C3E726479B3C0051953D /* TableFormattingQuirks.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F49C3E626479B3B0051953D /* TableFormattingQuirks.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx">           6F6383F62427AF4A00DABA53 /* LayoutInitialContainingBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F6383F42427AF4900DABA53 /* LayoutInitialContainingBlock.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          6F6DF36F264722EA0093E834 /* BlockMarginCollapse.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F6DF36E264722EA0093E834 /* BlockMarginCollapse.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          6F7CA3C6208C2957002F29AB /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F7CA3C4208C2956002F29AB /* LayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -9964,6 +9965,7 @@
</span><span class="cx">          6F3FBA962556E308003530FD /* LayoutIntegrationInlineContentBuilder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutIntegrationInlineContentBuilder.cpp; sourceTree = "<group>"; };
</span><span class="cx">          6F3FBA972556E312003530FD /* LayoutIntegrationInlineContentBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutIntegrationInlineContentBuilder.h; sourceTree = "<group>"; };
</span><span class="cx">          6F40DA812513033A00EC04B7 /* InlineRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineRect.h; sourceTree = "<group>"; };
</span><ins>+               6F49C3E626479B3B0051953D /* TableFormattingQuirks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableFormattingQuirks.h; sourceTree = "<group>"; };
</ins><span class="cx">           6F4A5BD522F9F16B00A80F25 /* LayoutPhase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutPhase.cpp; sourceTree = "<group>"; };
</span><span class="cx">          6F5B7EAA2300A79E0067D9C3 /* TableGrid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TableGrid.cpp; sourceTree = "<group>"; };
</span><span class="cx">          6F6383F42427AF4900DABA53 /* LayoutInitialContainingBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutInitialContainingBlock.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -10021,7 +10023,7 @@
</span><span class="cx">          6FB7D2DA250FD7FC000207AA /* FlexFormattingState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlexFormattingState.h; sourceTree = "<group>"; };
</span><span class="cx">          6FBB860520B464B600DAD938 /* FormattingContextGeometry.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FormattingContextGeometry.cpp; sourceTree = "<group>"; };
</span><span class="cx">          6FC3F9452516756600A49BEA /* InlineLineRun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineLineRun.h; sourceTree = "<group>"; };
</span><del>-               6FC53AEB24AF7A8E006059FE /* TableFormattingContextQuirks.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TableFormattingContextQuirks.cpp; sourceTree = "<group>"; };
</del><ins>+                6FC53AEB24AF7A8E006059FE /* TableFormattingQuirks.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TableFormattingQuirks.cpp; sourceTree = "<group>"; };
</ins><span class="cx">           6FC5CA9222E3599300B13E11 /* TableFormattingState.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TableFormattingState.cpp; sourceTree = "<group>"; };
</span><span class="cx">          6FC5CA9422E3599400B13E11 /* TableFormattingContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TableFormattingContext.cpp; sourceTree = "<group>"; };
</span><span class="cx">          6FC5CA9522E3599400B13E11 /* TableFormattingContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TableFormattingContext.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -22666,7 +22668,8 @@
</span><span class="cx">                          6FC5CA9422E3599400B13E11 /* TableFormattingContext.cpp */,
</span><span class="cx">                          6FC5CA9522E3599400B13E11 /* TableFormattingContext.h */,
</span><span class="cx">                          11D19C2E23159BAE008F24D3 /* TableFormattingContextGeometry.cpp */,
</span><del>-                               6FC53AEB24AF7A8E006059FE /* TableFormattingContextQuirks.cpp */,
</del><ins>+                                6FC53AEB24AF7A8E006059FE /* TableFormattingQuirks.cpp */,
+                               6F49C3E626479B3B0051953D /* TableFormattingQuirks.h */,
</ins><span class="cx">                           6FC5CA9222E3599300B13E11 /* TableFormattingState.cpp */,
</span><span class="cx">                          6FC5CA9622E3599500B13E11 /* TableFormattingState.h */,
</span><span class="cx">                          6F5B7EAA2300A79E0067D9C3 /* TableGrid.cpp */,
</span><span class="lines">@@ -35446,6 +35449,7 @@
</span><span class="cx">                          E3C04138254CB30D0021D0E6 /* SystemSoundDelegate.h in Headers */,
</span><span class="cx">                          E3C0412F254CA29B0021D0E6 /* SystemSoundManager.h in Headers */,
</span><span class="cx">                          5D5975B319635F1100D00878 /* SystemVersion.h in Headers */,
</span><ins>+                               6F49C3E726479B3C0051953D /* TableFormattingQuirks.h in Headers */,
</ins><span class="cx">                           A8CFF0510A154F09000A4234 /* TableLayout.h in Headers */,
</span><span class="cx">                          6F17264F2470C60B00518C96 /* TableWrapperBlockFormattingContext.h in Headers */,
</span><span class="cx">                          6F15522126476B5C00E353C6 /* TableWrapperBlockFormattingQuirks.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextstableTableFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp (277545 => 277546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp  2021-05-15 19:50:54 UTC (rev 277545)
+++ trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.cpp     2021-05-15 20:22:37 UTC (rev 277546)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "LayoutChildIterator.h"
</span><span class="cx"> #include "LayoutContext.h"
</span><span class="cx"> #include "LayoutInitialContainingBlock.h"
</span><ins>+#include "TableFormattingQuirks.h"
</ins><span class="cx"> #include "TableFormattingState.h"
</span><span class="cx"> #include <wtf/IsoMallocInlines.h>
</span><span class="cx"> 
</span><span class="lines">@@ -514,7 +515,13 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TableFormattingQuirks TableFormattingContext::quirks() const
+{
+    return TableFormattingQuirks(*this);
</ins><span class="cx"> }
</span><ins>+
+
</ins><span class="cx"> }
</span><ins>+}
</ins><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextstableTableFormattingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.h (277545 => 277546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.h    2021-05-15 19:50:54 UTC (rev 277545)
+++ trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContext.h       2021-05-15 20:22:37 UTC (rev 277546)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx"> namespace Layout {
</span><span class="cx"> 
</span><span class="cx"> class InvalidationState;
</span><ins>+class TableFormattingQuirks;
+
</ins><span class="cx"> // This class implements the layout logic for table formatting contexts.
</span><span class="cx"> // https://www.w3.org/TR/CSS22/tables.html
</span><span class="cx"> class TableFormattingContext final : public FormattingContext {
</span><span class="lines">@@ -48,22 +50,6 @@
</span><span class="cx"> 
</span><span class="cx">     static UniqueRef<TableGrid> ensureTableGrid(const ContainerBox& tableBox);
</span><span class="cx"> 
</span><del>-private:
-    class TableLayout {
-    public:
-        TableLayout(const TableFormattingContext&, const TableGrid&);
-
-        using DistributedSpaces = Vector<LayoutUnit>;
-        DistributedSpaces distributedHorizontalSpace(LayoutUnit availableHorizontalSpace);
-        DistributedSpaces distributedVerticalSpace(Optional<LayoutUnit> availableVerticalSpace);
-
-    private:
-        const TableFormattingContext& formattingContext() const { return m_formattingContext; }
-
-        const TableFormattingContext& m_formattingContext;
-        const TableGrid& m_grid;
-    };
-
</del><span class="cx">     class Geometry : public FormattingContext::Geometry {
</span><span class="cx">     public:
</span><span class="cx">         LayoutUnit cellHeigh(const ContainerBox&) const;
</span><span class="lines">@@ -81,17 +67,24 @@
</span><span class="cx">     };
</span><span class="cx">     TableFormattingContext::Geometry geometry() const { return Geometry(*this, formattingState().tableGrid()); }
</span><span class="cx"> 
</span><del>-    class Quirks : public FormattingContext::Quirks {
</del><ins>+private:
+    class TableLayout {
</ins><span class="cx">     public:
</span><del>-        Quirks(const TableFormattingContext&);
</del><ins>+        TableLayout(const TableFormattingContext&, const TableGrid&);
</ins><span class="cx"> 
</span><del>-        bool shouldIgnoreChildContentVerticalMargin(const ContainerBox&) const;
</del><ins>+        using DistributedSpaces = Vector<LayoutUnit>;
+        DistributedSpaces distributedHorizontalSpace(LayoutUnit availableHorizontalSpace);
+        DistributedSpaces distributedVerticalSpace(Optional<LayoutUnit> availableVerticalSpace);
</ins><span class="cx"> 
</span><del>-        const TableFormattingContext& formattingContext() const { return downcast<TableFormattingContext>(FormattingContext::Quirks::formattingContext()); }
-        TableFormattingContext::Geometry geometry() const { return formattingContext().geometry(); }
</del><ins>+    private:
+        const TableFormattingContext& formattingContext() const { return m_formattingContext; }
+
+        const TableFormattingContext& m_formattingContext;
+        const TableGrid& m_grid;
</ins><span class="cx">     };
</span><del>-    TableFormattingContext::Quirks quirks() const { return Quirks(*this); }
</del><span class="cx"> 
</span><ins>+    TableFormattingQuirks quirks() const;
+
</ins><span class="cx">     TableFormattingContext::TableLayout tableLayout() const { return TableLayout(*this, formattingState().tableGrid()); }
</span><span class="cx"> 
</span><span class="cx">     IntrinsicWidthConstraints computedIntrinsicWidthConstraints() override;
</span><span class="lines">@@ -113,13 +106,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline TableFormattingContext::Quirks::Quirks(const TableFormattingContext& tableFormattingContext)
-    : FormattingContext::Quirks(tableFormattingContext)
-{
</del><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><del>-}
</del><span class="cx"> 
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_LAYOUT_FORMATTING_CONTEXT(TableFormattingContext, isTableFormattingContext())
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextstableTableFormattingContextQuirkscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContextQuirks.cpp (277545 => 277546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContextQuirks.cpp    2021-05-15 19:50:54 UTC (rev 277545)
+++ trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContextQuirks.cpp       2021-05-15 20:22:37 UTC (rev 277546)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2020 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "TableFormattingContext.h"
-
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-
-#include "LayoutBox.h"
-#include "LayoutContainerBox.h"
-#include "LayoutState.h"
-
-namespace WebCore {
-namespace Layout {
-
-bool TableFormattingContext::Quirks::shouldIgnoreChildContentVerticalMargin(const ContainerBox& cellBox) const
-{
-    // Normally BFC root content height takes the margin box of the child content as vertical margins don't collapse with BFC roots,
-    // but table cell boxes do collapse their (non-existing) margins with child quirk margins (so much quirk), so here we check
-    // if the content height should include margins or not.
-    // e.g <table><tr><td><p>text content</td></tr></table> <- <p>'s quirk margin collapses with the <td> so its content
-    // height should not include vertical margins.
-    if (!layoutState().inQuirksMode())
-        return false;
-    if (cellBox.establishesInlineFormattingContext())
-        return false;
-    if (!cellBox.hasInFlowChild())
-        return false;
-    return cellBox.firstInFlowChild()->style().hasMarginBeforeQuirk() || cellBox.lastInFlowChild()->style().hasMarginAfterQuirk();
-}
-
-}
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextstableTableFormattingQuirkscppfromrev277545trunkSourceWebCorelayoutformattingContextstableTableFormattingContextQuirkscpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp (from rev 277545, trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContextQuirks.cpp) (0 => 277546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp                           (rev 0)
+++ trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp      2021-05-15 20:22:37 UTC (rev 277546)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "TableFormattingQuirks.h"
+
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+
+#include "LayoutBox.h"
+#include "LayoutContainerBox.h"
+#include "LayoutState.h"
+
+namespace WebCore {
+namespace Layout {
+
+TableFormattingQuirks::TableFormattingQuirks(const TableFormattingContext& tableFormattingContext)
+    : FormattingContext::Quirks(tableFormattingContext)
+{
+}
+
+bool TableFormattingQuirks::shouldIgnoreChildContentVerticalMargin(const ContainerBox& cellBox) const
+{
+    // Normally BFC root content height takes the margin box of the child content as vertical margins don't collapse with BFC roots,
+    // but table cell boxes do collapse their (non-existing) margins with child quirk margins (so much quirk), so here we check
+    // if the content height should include margins or not.
+    // e.g <table><tr><td><p>text content</td></tr></table> <- <p>'s quirk margin collapses with the <td> so its content
+    // height should not include vertical margins.
+    if (!layoutState().inQuirksMode())
+        return false;
+    if (cellBox.establishesInlineFormattingContext())
+        return false;
+    if (!cellBox.hasInFlowChild())
+        return false;
+    return cellBox.firstInFlowChild()->style().hasMarginBeforeQuirk() || cellBox.lastInFlowChild()->style().hasMarginAfterQuirk();
+}
+
+}
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextstableTableFormattingQuirkshfromrev277545trunkSourceWebCorelayoutformattingContextstableTableFormattingContextQuirkscpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.h (from rev 277545, trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingContextQuirks.cpp) (0 => 277546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.h                             (rev 0)
+++ trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.h        2021-05-15 20:22:37 UTC (rev 277546)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
+
+#include "FormattingContext.h"
+
+namespace WebCore {
+namespace Layout {
+
+class TableFormattingQuirks : public FormattingContext::Quirks {
+public:
+    TableFormattingQuirks(const TableFormattingContext&);
+
+    bool shouldIgnoreChildContentVerticalMargin(const ContainerBox&) const;
+
+private:
+    const TableFormattingContext& formattingContext() const { return downcast<TableFormattingContext>(FormattingContext::Quirks::formattingContext()); }
+    TableFormattingContext::Geometry geometry() const { return formattingContext().geometry(); }
+};
+
+}
+}
+
+#endif
</ins></span></pre>
</div>
</div>

</body>
</html>