Changeset 206821 in webkit

Timestamp:

Oct 5, 2016 11:50:20 AM (8 years ago)

Author:

Alan Bujtas

Message:

Missing quotation mark when <q> gets reparented.
​https://bugs.webkit.org/show_bug.cgi?id=162940

Reviewed by Darin Adler.

Source/WebCore:

When an opening RenderQuote gets removed due to some change in the render tree,
we notify the closing RenderQuote so that it can update its content (") accordingly (and vice versa).
However when the same RenderQuote is added back to the render tree (aka reparenting), we fail to
let the other RenderQuote know about it and its content becomes stale.
This patch ensures that when either the opening or closing part of the quotation mark gets reparented,
we inform the other, corresponding opening/closing renderer about it.

Test: fast/css-generated-content/missing-quotes-with-dynamic-content.html

• dom/PseudoElement.cpp:

(WebCore::PseudoElement::didAttachRenderers):

• rendering/RenderQuote.cpp:

(WebCore::RenderQuote::insertedIntoTree):

• rendering/RenderQuote.h:

LayoutTests:

The position of the closing quotation mark is driven by the multicolumn code hence the cover div.

• fast/css-generated-content/missing-quotes-with-dynamic-content-expected.html: Added.
• fast/css-generated-content/missing-quotes-with-dynamic-content.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content-expected.html (added)
• LayoutTests/fast/css-generated-content/missing-quotes-with-dynamic-content.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/PseudoElement.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderQuote.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderQuote.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-05  Zalan Bujtas  <zalan@apple.com>
+
+        Missing quotation mark when <q> gets reparented.
+        https://bugs.webkit.org/show_bug.cgi?id=162940
+
+        Reviewed by Darin Adler.
+
+        The position of the closing quotation mark is driven by the multicolumn code hence the cover div.
+
+        * fast/css-generated-content/missing-quotes-with-dynamic-content-expected.html: Added.
+        * fast/css-generated-content/missing-quotes-with-dynamic-content.html: Added.
+
 2016-10-05  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-05  Zalan Bujtas  <zalan@apple.com>
+
+        Missing quotation mark when <q> gets reparented.
+        https://bugs.webkit.org/show_bug.cgi?id=162940
+
+        Reviewed by Darin Adler.
+
+        When an opening RenderQuote gets removed due to some change in the render tree,
+        we notify the closing RenderQuote so that it can update its content (") accordingly (and vice versa).
+        However when the same RenderQuote is added back to the render tree (aka reparenting), we fail to
+        let the other RenderQuote know about it and its content becomes stale.  
+        This patch ensures that when either the opening or closing part of the quotation mark gets reparented,
+        we inform the other, corresponding opening/closing renderer about it.
+
+        Test: fast/css-generated-content/missing-quotes-with-dynamic-content.html
+
+        * dom/PseudoElement.cpp:
+        (WebCore::PseudoElement::didAttachRenderers):
+        * rendering/RenderQuote.cpp:
+        (WebCore::RenderQuote::insertedIntoTree):
+        * rendering/RenderQuote.h:
+
 2016-10-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/dom/PseudoElement.cpp

@@ -97 +97 @@
     for (const ContentData* content = style.contentData(); content; content = content->next()) {
         auto child = content->createContentRenderer(document(), style);
-        if (renderer->isChildAllowed(*child, style)) {
-            auto* childPtr = child.get();
+        if (renderer->isChildAllowed(*child, style))
             renderer->addChild(child.leakPtr());
-            if (is<RenderQuote>(*childPtr))
-                downcast<RenderQuote>(*childPtr).attachQuote();
-        }
     }
 }

trunk/Source/WebCore/rendering/RenderQuote.cpp

@@ -46 +46 @@
     ASSERT(!m_next);
     ASSERT(!m_previous);
+}
+
+void RenderQuote::insertedIntoTree()
+{
+    RenderInline::insertedIntoTree();
+    attachQuote();
 }
 

trunk/Source/WebCore/rendering/RenderQuote.h

@@ -41 +41 @@
     bool isQuote() const override { return true; }
     void styleDidChange(StyleDifference, const RenderStyle*) override;
+    void insertedIntoTree() override;
     void willBeRemovedFromTree() override;