Changeset 81778 in webkit

Timestamp:

Mar 23, 2011 9:38:58 AM (13 years ago)

Author:

carol.szabo@nokia.com

Message:

2011-03-23 Carol Szabo <​carol.szabo@nokia.com>

Reviewed by David Hyatt.

Added new test to expose failure to correctly find the
before/after container when creating a CSS counter.

CSS 2.1 failure: various before-after-* tests fail
​https://bugs.webkit.org/show_bug.cgi?id=47207

• fast/css/counters/complex-before-expected.txt: Added.
• fast/css/counters/complex-before.html: Added.

2011-03-23 Carol Szabo <​carol.szabo@nokia.com>

Reviewed by David Hyatt.

Modified RenderCounter::originalText() to correctly attach
the created counter to the before/after container even when
that is not the RenderCounter's direct parent.

CSS 2.1 failure: various before-after-* tests fail
​https://bugs.webkit.org/show_bug.cgi?id=47207

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

• rendering/RenderCounter.cpp: (WebCore::RenderCounter::originalText):

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-03-23  Carol Szabo  <carol.szabo@nokia.com>
+
+        Reviewed by David Hyatt.
+
+        Added new test to expose failure to correctly find the 
+        before/after container when creating a CSS counter.
+
+        CSS 2.1 failure: various before-after-* tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=47207
+
+        * fast/css/counters/complex-before-expected.txt: Added.
+        * fast/css/counters/complex-before.html: Added.
+
 2011-03-23  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-23  Carol Szabo  <carol.szabo@nokia.com>
+
+        Reviewed by David Hyatt.
+
+        Modified RenderCounter::originalText() to correctly attach
+        the created counter to the before/after container even when
+        that is not the RenderCounter's direct parent.
+
+        CSS 2.1 failure: various before-after-* tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=47207
+
+        Test: fast/css/counters/complex-before.html
+
+        * rendering/RenderCounter.cpp:
+        (WebCore::RenderCounter::originalText):
+
 2011-03-23  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/rendering/RenderCounter.cpp

@@ -475 +475 @@
 PassRefPtr<StringImpl> RenderCounter::originalText() const
 {
-    if (!parent())
-        return 0;
-
     if (!m_counterNode) {
-        makeCounterNode(parent(), m_counter.identifier(), true)->addRenderer(const_cast<RenderCounter*>(this));
+        RenderObject* beforeAfterContainer = parent();
+        while (true) {
+            if (!beforeAfterContainer)
+                return 0;
+            if (!beforeAfterContainer->isAnonymous())
+                return 0; // RenderCounters are restricted to before and after pseudo elements
+            PseudoId containerStyle = beforeAfterContainer->style()->styleType();
+            if ((containerStyle == BEFORE) || (containerStyle == AFTER))
+                break;
+            beforeAfterContainer = beforeAfterContainer->parent();
+        }
+        makeCounterNode(beforeAfterContainer, m_counter.identifier(), true)->addRenderer(const_cast<RenderCounter*>(this));
         ASSERT(m_counterNode);
     }