Changeset 130555 in webkit

Timestamp:

Oct 5, 2012 2:54:20 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Inline continuations create :after generated content on style recalcs
​https://bugs.webkit.org/show_bug.cgi?id=93170

Patch by Takashi Sakamoto <​tasak@google.com> on 2012-10-05
Reviewed by Abhishek Arya.

Source/WebCore:

The bug is caused by RenderInline::styleDidChange's setContinuation(0).
RenderObjectChildList uses continuation to know whether the given
renderer should have AFTER render object or not.
However, setContinuation(0) makes RenderObjectChildList to
misunderstand that all continuations are last continuation.
To avoid the misunderstanding, added a new flag to class
RenderObejctChildList to enable/disable updating :after content (and
also :before content).

Tests: fast/css-generated-content/after-with-inline-continuation.html

fast/css-generated-content/dynamic-apply-after-for-inline.html

• rendering/RenderInline.cpp:

(WebCore::RenderInline::styleDidChange):
Disable upating :after content for continuations which are not
the last one during setStyle just after setContinuation(0).
The setStyle invokes RenderInline::styleDidChange and also invokes
updateBeforeAfterContent via the styleDidChange. This means,
the last continuation's updateBeforeAfterContent is also invoked
after setContinuation(0). We have to update :after for the last
continuation.

• rendering/RenderObjectChildList.cpp:

(WebCore):
(WebCore::RenderObjectChildList::updateBeforeAfterContent):
If s_updateBeforeAfterContent is false, quickly exit
updateBeforeAfterContent.

• rendering/RenderObjectChildList.h:

(RenderObjectChildList):
Added a new flag s_enableUpdateBeforeAfterContent to enable/disable
updating :before or :after content.

LayoutTests:

• fast/css-generated-content/after-with-inline-continuation-expected.html: Added.
• fast/css-generated-content/after-with-inline-continuation.html: Added.
• fast/css-generated-content/dynamic-apply-after-for-inline-expected.html: Added.
• fast/css-generated-content/dynamic-apply-after-for-inline.html: Added.
• http/tests/misc/acid3-expected.txt:

The acid3-expected.txt has the duplicate RenderBlock (positioned).
Two 'layer at(638, 18) size 20x20, ... text run at (0,0) width 20: "X"'
exist. So did reset-results for acid3-expected.txt.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-generated-content/after-with-inline-continuation-expected.html (added)
• LayoutTests/fast/css-generated-content/after-with-inline-continuation.html (added)
• LayoutTests/fast/css-generated-content/dynamic-apply-after-for-inline-expected.html (added)
• LayoutTests/fast/css-generated-content/dynamic-apply-after-for-inline.html (added)
• LayoutTests/http/tests/misc/acid3-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderInline.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderObjectChildList.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderObjectChildList.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-05  Takashi Sakamoto  <tasak@google.com>
+
+        Inline continuations create :after generated content on style recalcs
+        https://bugs.webkit.org/show_bug.cgi?id=93170
+
+        Reviewed by Abhishek Arya.
+
+        * fast/css-generated-content/after-with-inline-continuation-expected.html: Added.
+        * fast/css-generated-content/after-with-inline-continuation.html: Added.
+        * fast/css-generated-content/dynamic-apply-after-for-inline-expected.html: Added.
+        * fast/css-generated-content/dynamic-apply-after-for-inline.html: Added.
+        * http/tests/misc/acid3-expected.txt:
+        The acid3-expected.txt has the duplicate RenderBlock (positioned).
+        Two 'layer at(638, 18) size 20x20, ... text run at (0,0) width 20: "X"'
+        exist. So did reset-results for acid3-expected.txt.
+
 2012-10-05  Tony Chang  <tony@chromium.org>
 

trunk/LayoutTests/http/tests/misc/acid3-expected.txt

@@ -217 +217 @@
         RenderText {#text} at (299,39) size 4x17
           text run at (299,39) width 4: "."
-layer at (638,18) size 20x20
-  RenderBlock (positioned) at (638,18) size 20x20 [color=#FFFFFF] [bgcolor=#FF00FF]
-    RenderText at (0,0) size 20x20
-      text run at (0,0) width 20: "X"
 layer at (130,84) size 300x150
   RenderEmbeddedObject {OBJECT} at (130,84) size 300x150

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-05  Takashi Sakamoto  <tasak@google.com>
+
+        Inline continuations create :after generated content on style recalcs
+        https://bugs.webkit.org/show_bug.cgi?id=93170
+
+        Reviewed by Abhishek Arya.
+
+        The bug is caused by RenderInline::styleDidChange's setContinuation(0).
+        RenderObjectChildList uses continuation to know whether the given
+        renderer should have AFTER render object or not.
+        However, setContinuation(0) makes RenderObjectChildList to
+        misunderstand that all continuations are last continuation.
+        To avoid the misunderstanding, added a new flag to class
+        RenderObejctChildList to enable/disable updating :after content (and
+        also :before content).
+
+        Tests: fast/css-generated-content/after-with-inline-continuation.html
+               fast/css-generated-content/dynamic-apply-after-for-inline.html
+
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::styleDidChange):
+        Disable upating :after content for continuations which are not
+        the last one during setStyle just after setContinuation(0).
+        The setStyle invokes RenderInline::styleDidChange and also invokes
+        updateBeforeAfterContent via the styleDidChange. This means,
+        the last continuation's updateBeforeAfterContent is also invoked
+        after setContinuation(0). We have to update :after for the last
+        continuation.
+        * rendering/RenderObjectChildList.cpp:
+        (WebCore):
+        (WebCore::RenderObjectChildList::updateBeforeAfterContent):
+        If s_updateBeforeAfterContent is false, quickly exit
+        updateBeforeAfterContent.
+        * rendering/RenderObjectChildList.h:
+        (RenderObjectChildList):
+        Added a new flag s_enableUpdateBeforeAfterContent to enable/disable
+        updating :before or :after content.
+
 2012-10-05  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -41 +41 @@
 #include "VisiblePosition.h"
 
+#include <wtf/TemporaryChange.h>
+
 #if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION)
 #include "Frame.h"
@@ -168 +170 @@
     RenderStyle* newStyle = style();
     RenderInline* continuation = inlineElementContinuation();
-    for (RenderInline* currCont = continuation; currCont; currCont = currCont->inlineElementContinuation()) {
-        RenderBoxModelObject* nextCont = currCont->continuation();
-        currCont->setContinuation(0);
-        currCont->setStyle(newStyle);
-        currCont->setContinuation(nextCont);
+    {
+        TemporaryChange<bool> enableAfter(RenderObjectChildList::s_enableUpdateBeforeAfterContent, false);
+        RenderInline* nextInlineElementCont = 0;
+        for (RenderInline* currCont = continuation; currCont; currCont = nextInlineElementCont) {
+            nextInlineElementCont = currCont->inlineElementContinuation();
+            // We need to update :after content for the last continuation in the chain.
+            RenderObjectChildList::s_enableUpdateBeforeAfterContent = !nextInlineElementCont;
+            RenderBoxModelObject* nextCont = currCont->continuation();
+            currCont->setContinuation(0);
+            currCont->setStyle(newStyle);
+            currCont->setContinuation(nextCont);
+        }
     }
 

trunk/Source/WebCore/rendering/RenderObjectChildList.cpp

@@ -46 +46 @@
 namespace WebCore {
 
+bool RenderObjectChildList::s_enableUpdateBeforeAfterContent = true;
+
 void RenderObjectChildList::destroyLeftoverChildren()
 {
@@ -375 +377 @@
     if (owner->style()->styleType() == BEFORE || owner->style()->styleType() == AFTER)
         return;
+    if (!s_enableUpdateBeforeAfterContent)
+        return;
     
     if (!styledObject)

trunk/Source/WebCore/rendering/RenderObjectChildList.h

@@ -61 +61 @@
     RenderObject* afterPseudoElementRenderer(const RenderObject* owner) const;
 
+public:
+    static bool s_enableUpdateBeforeAfterContent;
+
 private:
     void updateBeforeAfterStyle(RenderObject* child, PseudoId type, RenderStyle* pseudoElementStyle);