Changeset 77273 in webkit

Timestamp:

Feb 1, 2011 12:28:08 PM (13 years ago)

Author:

carol.szabo@nokia.com

Message:

2011-02-01 Carol Szabo <​carol.szabo@nokia.com>

Reviewed by David Hyatt.

layoutTestController.counterValueForElementById does not return the correct value
​https://bugs.webkit.org/show_bug.cgi?id=53037

• fast/css/counters/deep-before-expected.txt: Added.
• fast/css/counters/deep-before.html: Added. This tests whether DumpRenderTree properly retrieves counters and whether counters are properly set when the before pseudo element's renderer is not a direct child of the generating element's renderer.

2011-02-01 Carol Szabo <​carol.szabo@nokia.com>

Reviewed by David Hyatt.

layoutTestController.counterValueForElementById does not return the correct value
​https://bugs.webkit.org/show_bug.cgi?id=53037

Test: fast/css/counters/deep-before.html

• rendering/RenderTreeAsText.cpp: (WebCore::counterValueForElement): Modified to use the newly available RenderObject::beforePseudoElement() and RenderObject::afterPseudoElement() instead of the old imperfect algorithm to find the before and after pseudo elements.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/counters/deep-before-expected.txt (added)
• LayoutTests/fast/css/counters/deep-before.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTreeAsText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-01  Carol Szabo  <carol.szabo@nokia.com>
+
+        Reviewed by David Hyatt.
+
+        layoutTestController.counterValueForElementById does not return the correct value
+        https://bugs.webkit.org/show_bug.cgi?id=53037
+
+        * fast/css/counters/deep-before-expected.txt: Added.
+        * fast/css/counters/deep-before.html: Added.
+        This tests whether DumpRenderTree properly retrieves counters and
+        whether counters are properly set when the before pseudo element's
+        renderer is not a direct child of the generating element's renderer.
+
 2011-02-01  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-01  Carol Szabo  <carol.szabo@nokia.com>
+
+        Reviewed by David Hyatt.
+
+        layoutTestController.counterValueForElementById does not return the correct value
+        https://bugs.webkit.org/show_bug.cgi?id=53037
+
+        Test: fast/css/counters/deep-before.html
+
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::counterValueForElement):
+        Modified to use the newly available RenderObject::beforePseudoElement()
+        and RenderObject::afterPseudoElement() instead of the old imperfect
+        algorithm to find the before and after pseudo elements.
+
 2011-02-01  Anton Muhin  <antonm@chromium.org>
 

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -770 +770 @@
     TextStream stream;
     bool isFirstCounter = true;
-    // The counter renderers should be children of anonymous children
-    // (i.e., :before or :after pseudo-elements).
+    // The counter renderers should be children of :before or :after pseudo-elements.
     if (RenderObject* renderer = element->renderer()) {
-        for (RenderObject* child = renderer->firstChild(); child; child = child->nextSibling()) {
-            if (child->isAnonymous())
-                writeCounterValuesFromChildren(stream, child, isFirstCounter);
-        }
+        if (RenderObject* pseudoElement = renderer->beforePseudoElementRenderer())
+            writeCounterValuesFromChildren(stream, pseudoElement, isFirstCounter);
+        if (RenderObject* pseudoElement = renderer->afterPseudoElementRenderer())
+            writeCounterValuesFromChildren(stream, pseudoElement, isFirstCounter);
     }
     return stream.release();