Title: [287448] trunk/Source/WebCore
- Revision
- 287448
- Author
- [email protected]
- Date
- 2021-12-26 13:40:03 -0800 (Sun, 26 Dec 2021)
Log Message
Remove -webkit-{border-fit/margin-collapse} leftovers in StyleRareNonInheritedData
https://bugs.webkit.org/show_bug.cgi?id=234692
Reviewed by Simon Fraser.
r285615 removed -webkit-border-fit.
r287429 removed -webkit-margin-collapse properties.
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::hashForTextAutosizing const):
(WebCore::RenderStyle::equalForTextAutosizing const):
(WebCore::rareNonInheritedDataChangeRequiresLayout):
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator== const):
* rendering/style/StyleRareNonInheritedData.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (287447 => 287448)
--- trunk/Source/WebCore/ChangeLog 2021-12-26 19:24:52 UTC (rev 287447)
+++ trunk/Source/WebCore/ChangeLog 2021-12-26 21:40:03 UTC (rev 287448)
@@ -1,3 +1,22 @@
+2021-12-26 Tim Nguyen <[email protected]>
+
+ Remove -webkit-{border-fit/margin-collapse} leftovers in StyleRareNonInheritedData
+ https://bugs.webkit.org/show_bug.cgi?id=234692
+
+ Reviewed by Simon Fraser.
+
+ r285615 removed -webkit-border-fit.
+ r287429 removed -webkit-margin-collapse properties.
+
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::hashForTextAutosizing const):
+ (WebCore::RenderStyle::equalForTextAutosizing const):
+ (WebCore::rareNonInheritedDataChangeRequiresLayout):
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator== const):
+ * rendering/style/StyleRareNonInheritedData.h:
+
2021-12-26 Alan Bujtas <[email protected]>
[IFC][Integration] Update text renderer's needsVisualReordering bit
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (287447 => 287448)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2021-12-26 19:24:52 UTC (rev 287447)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2021-12-26 21:40:03 UTC (rev 287448)
@@ -461,8 +461,6 @@
{
// FIXME: Not a very smart hash. Could be improved upon. See <https://bugs.webkit.org/show_bug.cgi?id=121131>.
unsigned hash = m_rareNonInheritedData->effectiveAppearance;
- hash ^= m_rareNonInheritedData->marginBeforeCollapse;
- hash ^= m_rareNonInheritedData->marginAfterCollapse;
hash ^= m_rareNonInheritedData->lineClamp.value();
hash ^= m_rareInheritedData->overflowWrap;
hash ^= m_rareInheritedData->nbspMode;
@@ -483,8 +481,6 @@
bool RenderStyle::equalForTextAutosizing(const RenderStyle& other) const
{
return m_rareNonInheritedData->effectiveAppearance == other.m_rareNonInheritedData->effectiveAppearance
- && m_rareNonInheritedData->marginBeforeCollapse == other.m_rareNonInheritedData->marginBeforeCollapse
- && m_rareNonInheritedData->marginAfterCollapse == other.m_rareNonInheritedData->marginAfterCollapse
&& m_rareNonInheritedData->lineClamp == other.m_rareNonInheritedData->lineClamp
&& m_rareInheritedData->textSizeAdjust == other.m_rareInheritedData->textSizeAdjust
&& m_rareInheritedData->overflowWrap == other.m_rareInheritedData->overflowWrap
@@ -654,8 +650,6 @@
ASSERT(&first != &second);
if (first.effectiveAppearance != second.effectiveAppearance
- || first.marginBeforeCollapse != second.marginBeforeCollapse
- || first.marginAfterCollapse != second.marginAfterCollapse
|| first.lineClamp != second.lineClamp
|| first.initialLetter != second.initialLetter
|| first.textOverflow != second.textOverflow)
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (287447 => 287448)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2021-12-26 19:24:52 UTC (rev 287447)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2021-12-26 21:40:03 UTC (rev 287448)
@@ -193,11 +193,8 @@
, userDrag(o.userDrag)
, textOverflow(o.textOverflow)
, useSmoothScrolling(o.useSmoothScrolling)
- , marginBeforeCollapse(o.marginBeforeCollapse)
- , marginAfterCollapse(o.marginAfterCollapse)
, appearance(o.appearance)
, effectiveAppearance(o.effectiveAppearance)
- , borderFit(o.borderFit)
, textCombine(o.textCombine)
, textDecorationStyle(o.textDecorationStyle)
, aspectRatioType(o.aspectRatioType)
@@ -302,11 +299,8 @@
&& userDrag == o.userDrag
&& textOverflow == o.textOverflow
&& useSmoothScrolling == o.useSmoothScrolling
- && marginBeforeCollapse == o.marginBeforeCollapse
- && marginAfterCollapse == o.marginAfterCollapse
&& appearance == o.appearance
&& effectiveAppearance == o.effectiveAppearance
- && borderFit == o.borderFit
&& textCombine == o.textCombine
&& textDecorationStyle == o.textDecorationStyle
&& arePointingToEqualData(rotate, o.rotate)
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (287447 => 287448)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2021-12-26 19:24:52 UTC (rev 287447)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2021-12-26 21:40:03 UTC (rev 287448)
@@ -200,11 +200,8 @@
unsigned userDrag : 2; // UserDrag
unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
unsigned useSmoothScrolling : 1; // ScrollBehavior
- unsigned marginBeforeCollapse : 2; // MarginCollapse
- unsigned marginAfterCollapse : 2; // MarginCollapse
unsigned appearance : 6; // EAppearance
unsigned effectiveAppearance : 6; // EAppearance
- unsigned borderFit : 1; // BorderFit
unsigned textCombine : 1; // CSS3 text-combine properties
unsigned textDecorationStyle : 3; // TextDecorationStyle
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
