Title: [283896] trunk/Source/WebCore
- Revision
- 283896
- Author
- [email protected]
- Date
- 2021-10-11 08:55:01 -0700 (Mon, 11 Oct 2021)
Log Message
LineLayoutPath::LineBoxesPath name is outdated
https://bugs.webkit.org/show_bug.cgi?id=231494
Reviewed by Antti Koivisto.
* layout/integration/LayoutIntegrationCoverage.cpp:
(WebCore::LayoutIntegration::printModernLineLayoutCoverage):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutInlineChildren):
(WebCore::RenderBlockFlow::invalidateLineLayoutPath):
* rendering/RenderBlockFlow.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (283895 => 283896)
--- trunk/Source/WebCore/ChangeLog 2021-10-11 15:43:25 UTC (rev 283895)
+++ trunk/Source/WebCore/ChangeLog 2021-10-11 15:55:01 UTC (rev 283896)
@@ -1,3 +1,17 @@
+2021-10-11 Alan Bujtas <[email protected]>
+
+ LineLayoutPath::LineBoxesPath name is outdated
+ https://bugs.webkit.org/show_bug.cgi?id=231494
+
+ Reviewed by Antti Koivisto.
+
+ * layout/integration/LayoutIntegrationCoverage.cpp:
+ (WebCore::LayoutIntegration::printModernLineLayoutCoverage):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::layoutInlineChildren):
+ (WebCore::RenderBlockFlow::invalidateLineLayoutPath):
+ * rendering/RenderBlockFlow.h:
+
2021-10-11 Antti Koivisto <[email protected]>
Remove inline box decoration painting quirk
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (283895 => 283896)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-10-11 15:43:25 UTC (rev 283895)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-10-11 15:55:01 UTC (rev 283896)
@@ -334,7 +334,7 @@
textLength += flowLength;
auto reasons = canUseForLineLayoutWithReason(*flow, IncludeReasons::All);
if (reasons.isEmpty()) {
- if (flow->lineLayoutPath() == RenderBlockFlow::ForceLineBoxesPath) {
+ if (flow->lineLayoutPath() == RenderBlockFlow::ForcedLegacyPath) {
supportedButForcedToLineLayoutTextLength += flowLength;
++numberOfSupportedButForcedToLineLayoutLeafBlocks;
}
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (283895 => 283896)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2021-10-11 15:43:25 UTC (rev 283895)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2021-10-11 15:55:01 UTC (rev 283896)
@@ -690,7 +690,7 @@
if (LayoutIntegration::LineLayout::canUseFor(*this))
return ModernPath;
#endif
- return LineBoxesPath;
+ return LegacyPath;
};
if (lineLayoutPath() == UndeterminedPath)
@@ -3728,9 +3728,9 @@
{
switch (lineLayoutPath()) {
case UndeterminedPath:
- case ForceLineBoxesPath:
+ case ForcedLegacyPath:
return;
- case LineBoxesPath:
+ case LegacyPath:
setLineLayoutPath(UndeterminedPath);
return;
case ModernPath: {
@@ -3738,7 +3738,7 @@
auto path = UndeterminedPath;
#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
if (modernLineLayout() && modernLineLayout()->shouldSwitchToLegacyOnInvalidation())
- path = ForceLineBoxesPath;
+ path = ForcedLegacyPath;
#endif
m_lineLayout = WTF::Monostate();
setLineLayoutPath(path);
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (283895 => 283896)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2021-10-11 15:43:25 UTC (rev 283895)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2021-10-11 15:55:01 UTC (rev 283896)
@@ -345,7 +345,7 @@
bool hasLines() const;
void invalidateLineLayoutPath() final;
- enum LineLayoutPath { UndeterminedPath = 0, LineBoxesPath, ModernPath, ForceLineBoxesPath };
+ enum LineLayoutPath { UndeterminedPath = 0, ModernPath, LegacyPath, ForcedLegacyPath };
LineLayoutPath lineLayoutPath() const { return static_cast<LineLayoutPath>(renderBlockFlowLineLayoutPath()); }
void setLineLayoutPath(LineLayoutPath path) { setRenderBlockFlowLineLayoutPath(path); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
