Changeset 293497 in webkit

Timestamp:

Apr 26, 2022 10:30:42 PM (3 months ago)

Author:

Antti Koivisto

Message:

::first-letter does not work if used only in shadow content
​https://bugs.webkit.org/show_bug.cgi?id=220650
<rdar://problem/73477161>

Reviewed by Alan Bujtas.

Source/WebCore:

Test: fast/shadow-dom/shadow-first-line-and-letter.html

We were not setting usesFirstLetter/LinesRules bits if those pseudo-elements were used
only in shadow trees.

Fix by removing the bits. They don't seem to allow any valuable optimizations.

• rendering/LegacyRootInlineBox.cpp:

(WebCore::LegacyRootInlineBox::verticalPositionForBox):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::lineHeight const):
(WebCore::RenderBlock::getFirstLetter):

• rendering/RenderInline.cpp:

(WebCore::RenderInline::mayAffectLayout const):
(WebCore::RenderInline::lineHeight const):

• rendering/RenderLineBreak.cpp:

(WebCore::RenderLineBreak::lineHeight const):

• rendering/RenderView.h:
• style/StyleTreeResolver.cpp:

(WebCore::Style::TreeResolver::createAnimatedElementUpdate):
(WebCore::Style::TreeResolver::resolve):

LayoutTests:

Test case by ​vb@bigdot.de.

• fast/shadow-dom/shadow-first-line-and-letter-expected.html: Added.
• fast/shadow-dom/shadow-first-line-and-letter.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/shadow-first-line-and-letter-expected.html (added)
• LayoutTests/fast/shadow-dom/shadow-first-line-and-letter.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/LegacyRootInlineBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderInline.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLineBreak.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderView.h (modified) (2 diffs)
• Source/WebCore/style/StyleTreeResolver.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-26  Antti Koivisto  <antti@apple.com>
+
+        ::first-letter does not work if used only in shadow content
+        https://bugs.webkit.org/show_bug.cgi?id=220650
+        <rdar://problem/73477161>
+
+        Reviewed by Alan Bujtas.
+
+        Test case by vb@bigdot.de.
+
+        * fast/shadow-dom/shadow-first-line-and-letter-expected.html: Added.
+        * fast/shadow-dom/shadow-first-line-and-letter.html: Added.
+
 2022-04-26  Truitt Savell  <tsavell@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-26  Antti Koivisto  <antti@apple.com>
+
+        ::first-letter does not work if used only in shadow content
+        https://bugs.webkit.org/show_bug.cgi?id=220650
+        <rdar://problem/73477161>
+
+        Reviewed by Alan Bujtas.
+
+        Test: fast/shadow-dom/shadow-first-line-and-letter.html
+
+        We were not setting usesFirstLetter/LinesRules bits if those pseudo-elements were used
+        only in shadow trees.
+
+        Fix by removing the bits. They don't seem to allow any valuable optimizations.
+
+        * rendering/LegacyRootInlineBox.cpp:
+        (WebCore::LegacyRootInlineBox::verticalPositionForBox):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::lineHeight const):
+        (WebCore::RenderBlock::getFirstLetter):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::mayAffectLayout const):
+        (WebCore::RenderInline::lineHeight const):
+        * rendering/RenderLineBreak.cpp:
+        (WebCore::RenderLineBreak::lineHeight const):
+        * rendering/RenderView.h:
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::TreeResolver::createAnimatedElementUpdate):
+        (WebCore::Style::TreeResolver::resolve):
+
 2022-04-26  Oriol Brufau  <obrufau@igalia.com>
 

trunk/Source/WebCore/rendering/LegacyRootInlineBox.cpp

@@ -799 +799 @@
     // This method determines the vertical position for inline elements.
     bool firstLine = isFirstLine();
-    if (firstLine && !blockFlow().view().usesFirstLineRules())
-        firstLine = false;
 
     // Check the cache.

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2459 +2459 @@
         return RenderBox::lineHeight(firstLine, direction, linePositionMode);
 
-    if (firstLine && view().usesFirstLineRules()) {
-        auto& s = firstLineStyle();
-        if (&s != &style())
-            return s.computedLineHeight();
-    }
-    
-    return style().computedLineHeight();
+    auto& lineStyle = firstLine ? firstLineStyle() : style();
+    return lineStyle.computedLineHeight();
 }
 
@@ -2618 +2613 @@
     firstLetter = nullptr;
     firstLetterContainer = nullptr;
-
-    if (!view().usesFirstLetterRules())
-        return;
 
     // Don't recur

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -216 +216 @@
         || hasHardLineBreakChildOnly;
 
-    if (!mayAffectLayout && checkFonts && view().usesFirstLineRules()) {
+    if (!mayAffectLayout && checkFonts) {
         // Have to check the first line style as well.
         parentStyle = &parent()->firstLineStyle();
@@ -857 +857 @@
 LayoutUnit RenderInline::lineHeight(bool firstLine, LineDirectionMode /*direction*/, LinePositionMode /*linePositionMode*/) const
 {
-    if (firstLine && view().usesFirstLineRules()) {
-        const RenderStyle& firstLineStyle = this->firstLineStyle();
-        if (&firstLineStyle != &style())
-            return firstLineStyle.computedLineHeight();
-    }
-
-    return style().computedLineHeight();
+    auto& lineStyle = firstLine ? firstLineStyle() : style();
+    return lineStyle.computedLineHeight();
 }
 

trunk/Source/WebCore/rendering/RenderLineBreak.cpp

@@ -67 +67 @@
 LayoutUnit RenderLineBreak::lineHeight(bool firstLine, LineDirectionMode /*direction*/, LinePositionMode /*linePositionMode*/) const
 {
-    if (firstLine && view().usesFirstLineRules()) {
+    if (firstLine) {
         const RenderStyle& firstLineStyle = this->firstLineStyle();
         if (&firstLineStyle != &style())

trunk/Source/WebCore/rendering/RenderView.h

@@ -129 +129 @@
     WEBCORE_EXPORT bool usesCompositing() const;
 
-    bool usesFirstLineRules() const { return m_usesFirstLineRules; }
-    bool usesFirstLetterRules() const { return m_usesFirstLetterRules; }
-    void setUsesFirstLineRules(bool value) { m_usesFirstLineRules = value; }
-    void setUsesFirstLetterRules(bool value) { m_usesFirstLetterRules = value; }
-
     WEBCORE_EXPORT IntRect unscaledDocumentRect() const;
     LayoutRect unextendedBackgroundRect() const;
@@ -266 +261 @@
 
     bool m_hasSoftwareFilters { false };
-    bool m_usesFirstLineRules { false };
-    bool m_usesFirstLetterRules { false };
     bool m_needsRepaintHackAfterCompositingLayerUpdateForDebugOverlaysOnly { false };
     bool m_needsEventRegionUpdateForNonCompositedFrame { false };

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -46 +46 @@
 #include "RenderElement.h"
 #include "RenderStyle.h"
-#include "RenderView.h"
 #include "RuntimeEnabledFeatures.h"
 #include "Settings.h"
@@ -491 +490 @@
     // First, we need to make sure that any new CSS animation occuring on this element has a matching WebAnimation
     // on the document timeline.
-    if (document.backForwardCacheState() == Document::NotInBackForwardCache && !document.renderView()->printing()) {
+    if (document.backForwardCacheState() == Document::NotInBackForwardCache && !document.printing()) {
         if (oldStyle && (oldStyle->hasTransitions() || newStyle->hasTransitions()))
             styleable.updateCSSTransitions(*oldStyle, *newStyle);
@@ -788 +787 @@
 std::unique_ptr<Update> TreeResolver::resolve()
 {
-    auto& renderView = *m_document.renderView();
-
     Element* documentElement = m_document.documentElement();
     if (!documentElement) {
@@ -810 +807 @@
     m_parentStack.append(Parent(m_document));
 
-    auto rootResolver = scope().resolver;
-
-    // Pseudo element removal and similar may only work with these flags still set. Reset them after the style recalc.
-    renderView.setUsesFirstLineRules(renderView.usesFirstLineRules() || rootResolver->usesFirstLineRules());
-    renderView.setUsesFirstLetterRules(renderView.usesFirstLetterRules() || rootResolver->usesFirstLetterRules());
-
     resolveComposedTree();
-
-    renderView.setUsesFirstLineRules(rootResolver->usesFirstLineRules());
-    renderView.setUsesFirstLetterRules(rootResolver->usesFirstLetterRules());
 
     ASSERT(m_scopeStack.size() == 1);