Title: [271520] trunk/Source/WebCore
- Revision
- 271520
- Author
- [email protected]
- Date
- 2021-01-15 06:39:33 -0800 (Fri, 15 Jan 2021)
Log Message
[LFC] Rename inNoQuirksMode to inStandardsMode
https://bugs.webkit.org/show_bug.cgi?id=220655
Reviewed by Antti Koivisto.
"inStandardsMode" reads better.
* layout/LayoutState.h:
(WebCore::Layout::LayoutState::inStandardsMode const):
(WebCore::Layout::LayoutState::inNoQuirksMode const): Deleted.
* layout/inlineformatting/InlineFormattingContextGeometry.cpp:
(WebCore::Layout::LineBoxBuilder::LineBoxBuilder):
* layout/inlineformatting/InlineFormattingContextQuirks.cpp:
(WebCore::Layout::InlineFormattingContext::Quirks::initialLineHeight const):
(WebCore::Layout::InlineFormattingContext::Quirks::inlineLevelBoxAffectsLineBox const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (271519 => 271520)
--- trunk/Source/WebCore/ChangeLog 2021-01-15 14:10:33 UTC (rev 271519)
+++ trunk/Source/WebCore/ChangeLog 2021-01-15 14:39:33 UTC (rev 271520)
@@ -1,3 +1,21 @@
+2021-01-15 Zalan Bujtas <[email protected]>
+
+ [LFC] Rename inNoQuirksMode to inStandardsMode
+ https://bugs.webkit.org/show_bug.cgi?id=220655
+
+ Reviewed by Antti Koivisto.
+
+ "inStandardsMode" reads better.
+
+ * layout/LayoutState.h:
+ (WebCore::Layout::LayoutState::inStandardsMode const):
+ (WebCore::Layout::LayoutState::inNoQuirksMode const): Deleted.
+ * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+ (WebCore::Layout::LineBoxBuilder::LineBoxBuilder):
+ * layout/inlineformatting/InlineFormattingContextQuirks.cpp:
+ (WebCore::Layout::InlineFormattingContext::Quirks::initialLineHeight const):
+ (WebCore::Layout::InlineFormattingContext::Quirks::inlineLevelBoxAffectsLineBox const):
+
2021-01-15 Philippe Normand <[email protected]>
[GStreamer] Clean-up the TextSink
Modified: trunk/Source/WebCore/layout/LayoutState.h (271519 => 271520)
--- trunk/Source/WebCore/layout/LayoutState.h 2021-01-15 14:10:33 UTC (rev 271519)
+++ trunk/Source/WebCore/layout/LayoutState.h 2021-01-15 14:39:33 UTC (rev 271520)
@@ -81,7 +81,7 @@
enum class QuirksMode { No, Limited, Yes };
bool inQuirksMode() const { return m_quirksMode == QuirksMode::Yes; }
bool inLimitedQuirksMode() const { return m_quirksMode == QuirksMode::Limited; }
- bool inNoQuirksMode() const { return m_quirksMode == QuirksMode::No; }
+ bool inStandardsMode() const { return m_quirksMode == QuirksMode::No; }
bool hasRoot() const { return !!m_rootContainer; }
const ContainerBox& root() const { return *m_rootContainer; }
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp (271519 => 271520)
--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp 2021-01-15 14:10:33 UTC (rev 271519)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp 2021-01-15 14:39:33 UTC (rev 271520)
@@ -149,7 +149,7 @@
LineBoxBuilder::LineBoxBuilder(const InlineFormattingContext& inlineFormattingContext)
: m_inlineFormattingContext(inlineFormattingContext)
- , m_inlineLevelBoxesNeedVerticalAlignment(!inlineFormattingContext.layoutState().inNoQuirksMode())
+ , m_inlineLevelBoxesNeedVerticalAlignment(!inlineFormattingContext.layoutState().inStandardsMode())
{
}
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextQuirks.cpp (271519 => 271520)
--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextQuirks.cpp 2021-01-15 14:10:33 UTC (rev 271519)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextQuirks.cpp 2021-01-15 14:39:33 UTC (rev 271520)
@@ -37,7 +37,7 @@
{
// Negative lineHeight value means the line-height is not set
auto& root = formattingContext().root();
- if (layoutState().inNoQuirksMode() || !root.style().lineHeight().isNegative())
+ if (layoutState().inStandardsMode() || !root.style().lineHeight().isNegative())
return root.style().computedLineHeight();
return root.style().fontMetrics().floatHeight();
}
@@ -45,7 +45,7 @@
bool InlineFormattingContext::Quirks::inlineLevelBoxAffectsLineBox(const LineBox::InlineLevelBox& inlineLevelBox, const LineBox& lineBox) const
{
if (inlineLevelBox.isLineBreakBox()) {
- if (layoutState().inNoQuirksMode())
+ if (layoutState().inStandardsMode())
return true;
// In quirks mode linebreak boxes (<br>) affect the line box when they are inside a non-root inline box (<span></span>) or when
// the line has no other inline level box/root inlinebox has no content.
@@ -65,7 +65,7 @@
return true;
}
}
- auto inlineBoxHasImaginaryStrut = layoutState().inNoQuirksMode();
+ auto inlineBoxHasImaginaryStrut = layoutState().inStandardsMode();
return inlineBoxHasImaginaryStrut && !lineBox.isConsideredEmpty();
}
if (inlineLevelBox.isAtomicInlineLevelBox()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
