Changeset 271232 in webkit

Timestamp:

Jan 7, 2021, 2:05:19 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Only update the resources when rendering SVG selected text
​https://bugs.webkit.org/show_bug.cgi?id=218486

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2021-01-07
Reviewed by Ryosuke Niwa.

Instead of calling SVGResourcesCache::clientStyleChanged() that marks the renderer for layout and parent
resource invalidation, add a helper class SVGResourcesCache::SetStyleForScope() that just updates the resources
for the new style on construction and restores the previous one on destruction.

• rendering/svg/SVGInlineTextBox.cpp:

(WebCore::SVGInlineTextBox::paintText): Use SVGResourcesCache::SetStyleForScope().

• rendering/svg/SVGResourcesCache.cpp:

(WebCore::SVGResourcesCache::SetStyleForScope::SetStyleForScope): Call setStyle() with the new style.
(WebCore::SVGResourcesCache::SetStyleForScope::~SetStyleForScope): Call setStyle() with the previous style.
(WebCore::SVGResourcesCache::SetStyleForScope::setStyle): Set the given style if needed.

• rendering/svg/SVGResourcesCache.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/svg/SVGInlineTextBox.cpp (modified) (1 diff)
• rendering/svg/SVGResourcesCache.cpp (modified) (1 diff)
• rendering/svg/SVGResourcesCache.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Only update the resources when rendering SVG selected text
+        https://bugs.webkit.org/show_bug.cgi?id=218486
+
+        Reviewed by Ryosuke Niwa.
+
+        Instead of calling SVGResourcesCache::clientStyleChanged() that marks the renderer for layout and parent
+        resource invalidation, add a helper class SVGResourcesCache::SetStyleForScope() that just updates the resources
+        for the new style on construction and restores the previous one on destruction.
+
+        * rendering/svg/SVGInlineTextBox.cpp:
+        (WebCore::SVGInlineTextBox::paintText): Use SVGResourcesCache::SetStyleForScope().
+        * rendering/svg/SVGResourcesCache.cpp:
+        (WebCore::SVGResourcesCache::SetStyleForScope::SetStyleForScope): Call setStyle() with the new style.
+        (WebCore::SVGResourcesCache::SetStyleForScope::~SetStyleForScope): Call setStyle() with the previous style.
+        (WebCore::SVGResourcesCache::SetStyleForScope::setStyle): Set the given style if needed.
+        * rendering/svg/SVGResourcesCache.h:
+
 2021-01-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp

@@ -603 +603 @@
 
     // Draw text using selection style from the start to the end position of the selection
-    if (style != selectionStyle)
-        SVGResourcesCache::clientStyleChanged(parent()->renderer(), StyleDifference::Repaint, selectionStyle);
-
-    paintTextWithShadows(context, selectionStyle, textRun, fragment, startPosition, endPosition);
-
-    if (style != selectionStyle)
-        SVGResourcesCache::clientStyleChanged(parent()->renderer(), StyleDifference::Repaint, style);
+    {
+        SVGResourcesCache::SetStyleForScope temporaryStyleChange(parent()->renderer(), style, selectionStyle);
+        paintTextWithShadows(context, selectionStyle, textRun, fragment, startPosition, endPosition);
+    }
 
     // Eventually draw text using regular style from the end position of the selection to the end of the current chunk part

trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp

@@ -170 +170 @@
 }
 
+SVGResourcesCache::SetStyleForScope::SetStyleForScope(RenderElement& renderer, const RenderStyle& scopedStyle, const RenderStyle& newStyle)
+    : m_renderer(renderer)
+    , m_scopedStyle(scopedStyle)
+    , m_needsNewStyle(scopedStyle != newStyle && rendererCanHaveResources(renderer))
+{
+    setStyle(newStyle);
 }
+
+SVGResourcesCache::SetStyleForScope::~SetStyleForScope()
+{
+    setStyle(m_scopedStyle);
+}
+
+void SVGResourcesCache::SetStyleForScope::setStyle(const RenderStyle& style)
+{
+    if (!m_needsNewStyle)
+        return;
+
+    auto& cache = resourcesCacheFromRenderer(m_renderer);
+    cache.removeResourcesFromRenderer(m_renderer);
+    cache.addResourcesFromRenderer(m_renderer, style);
+}
+
+}

trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h

@@ -59 +59 @@
     static void resourceDestroyed(RenderSVGResourceContainer&);
 
+    class SetStyleForScope {
+        WTF_MAKE_NONCOPYABLE(SetStyleForScope);
+    public:
+        SetStyleForScope(RenderElement&, const RenderStyle& scopedStyle, const RenderStyle& newStyle);
+        ~SetStyleForScope();
+    private:
+        void setStyle(const RenderStyle&);
+
+        RenderElement& m_renderer;
+        const RenderStyle& m_scopedStyle;
+        bool m_needsNewStyle { false };
+    };
+
 private:
     void addResourcesFromRenderer(RenderElement&, const RenderStyle&);