Changeset 109134 in webkit

Timestamp:

Feb 28, 2012 11:55:39 AM (12 years ago)

Author:

alexis.menard@openbossa.org

Message:

getComputedStyle fails for 'first-line' pseudo-element
​https://bugs.webkit.org/show_bug.cgi?id=57505

Reviewed by Tony Chang.

Source/WebCore:

Querying the selector with a pseudo-element using getComputedStyle should work
even if the selector was not declared in the stylesheet. When not declared, we need
to use the RenderStyle created to do the rendering as there is no pseudo-style.
This match the behavior of Firefox.

No new tests : Updated expectation and extended getComputedStyle-with-pseudo-element.html.

• dom/Element.cpp:

(WebCore::Element::computedStyle):

LayoutTests:

Update expected results to the new behavior. Also added some extra checks on
other pseudo-elements.

• fast/css/getComputedStyle/getComputedStyle-with-pseudo-element-expected.txt:
• fast/css/getComputedStyle/getComputedStyle-with-pseudo-element.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/getComputedStyle/getComputedStyle-with-pseudo-element-expected.txt (modified) (1 diff)
• LayoutTests/fast/css/getComputedStyle/getComputedStyle-with-pseudo-element.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-28  Alexis Menard  <alexis.menard@openbossa.org>
+
+        getComputedStyle fails for 'first-line' pseudo-element
+        https://bugs.webkit.org/show_bug.cgi?id=57505
+
+        Reviewed by Tony Chang.
+
+        Update expected results to the new behavior. Also added some extra checks on
+        other pseudo-elements.
+
+        * fast/css/getComputedStyle/getComputedStyle-with-pseudo-element-expected.txt:
+        * fast/css/getComputedStyle/getComputedStyle-with-pseudo-element.html:
+
 2012-02-28  Alexey Proskuryakov  <ap@apple.com>
 

trunk/LayoutTests/fast/css/getComputedStyle/getComputedStyle-with-pseudo-element-expected.txt

@@ -18 +18 @@
 PASS Expected 'rgb(0, 0, 255)' for color in the computed style for element with id testBeforeAfter and pseudo-element :after and got 'rgb(0, 0, 255)'
 PASS Expected 'rgb(165, 42, 42)' for color in the computed style for element with id testNoPseudoElement and pseudo-element null and got 'rgb(165, 42, 42)'
-PASS Expected '' for color in the computed style for element with id testNoPseudoElement and pseudo-element :first-line and got ''
+PASS Expected 'rgb(165, 42, 42)' for color in the computed style for element with id testNoPseudoElement and pseudo-element :first-line and got 'rgb(165, 42, 42)'
+PASS Expected 'rgb(165, 42, 42)' for color in the computed style for element with id testNoPseudoElement and pseudo-element :first-letter and got 'rgb(165, 42, 42)'
+PASS Expected 'rgb(165, 42, 42)' for color in the computed style for element with id testNoPseudoElement and pseudo-element :before and got 'rgb(165, 42, 42)'
+PASS Expected 'rgb(165, 42, 42)' for color in the computed style for element with id testNoPseudoElement and pseudo-element :after and got 'rgb(165, 42, 42)'
 PASS Expected 'rgb(165, 42, 42)' for color in the computed style for element with id testNoPseudoElement and pseudo-element :garbage and got 'rgb(165, 42, 42)'
 PASS Expected '0.5' for opacity in the computed style for element with id testHardwareAcceleratedCompositing and pseudo-element :before and got '0.5'

trunk/LayoutTests/fast/css/getComputedStyle/getComputedStyle-with-pseudo-element.html

@@ -68 +68 @@
         { 'elementId' : 'testBeforeAfter', 'pseudoElement' : ':after', 'property' : 'color', 'expectedValue' : 'rgb(0, 0, 255)' },
         { 'elementId' : 'testNoPseudoElement', 'pseudoElement' : null, 'property' : 'color', 'expectedValue' : 'rgb(165, 42, 42)' },
-        { 'elementId' : 'testNoPseudoElement', 'pseudoElement' : ':first-line', 'property' : 'color', 'expectedValue' : '' },
+        { 'elementId' : 'testNoPseudoElement', 'pseudoElement' : ':first-line', 'property' : 'color', 'expectedValue' : 'rgb(165, 42, 42)' },
+        { 'elementId' : 'testNoPseudoElement', 'pseudoElement' : ':first-letter', 'property' : 'color', 'expectedValue' : 'rgb(165, 42, 42)' },
+        { 'elementId' : 'testNoPseudoElement', 'pseudoElement' : ':before', 'property' : 'color', 'expectedValue' : 'rgb(165, 42, 42)' },
+        { 'elementId' : 'testNoPseudoElement', 'pseudoElement' : ':after', 'property' : 'color', 'expectedValue' : 'rgb(165, 42, 42)' },
         { 'elementId' : 'testNoPseudoElement', 'pseudoElement' : ':garbage', 'property' : 'color', 'expectedValue' : 'rgb(165, 42, 42)' },
         { 'elementId' : 'testHardwareAcceleratedCompositing', 'pseudoElement' : ':before', 'property' : 'opacity', 'expectedValue' : '0.5' }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-28  Alexis Menard  <alexis.menard@openbossa.org>
+
+        getComputedStyle fails for 'first-line' pseudo-element
+        https://bugs.webkit.org/show_bug.cgi?id=57505
+
+        Reviewed by Tony Chang.
+
+        Querying the selector with a pseudo-element using getComputedStyle should work
+        even if the selector was not declared in the stylesheet. When not declared, we need
+        to use the RenderStyle created to do the rendering as there is no pseudo-style.
+        This match the behavior of Firefox.
+
+        No new tests : Updated expectation and extended getComputedStyle-with-pseudo-element.html.
+
+        * dom/Element.cpp:
+        (WebCore::Element::computedStyle):
+
 2012-02-28  Ashod Nakashian  <ashodnakashian@yahoo.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1608 +1608 @@
     // properties, which are only known by the renderer because it did the layout, will be correct and so that the
     // values returned for the ":selection" pseudo-element will be correct.
-    if (RenderStyle* usedStyle = renderStyle())
-        return pseudoElementSpecifier ? usedStyle->getCachedPseudoStyle(pseudoElementSpecifier) : usedStyle;
+    if (RenderStyle* usedStyle = renderStyle()) {
+        if (pseudoElementSpecifier) {
+            RenderStyle* cachedPseudoStyle = usedStyle->getCachedPseudoStyle(pseudoElementSpecifier);
+            return cachedPseudoStyle ? cachedPseudoStyle : usedStyle;
+         } else
+            return usedStyle;
+    }
 
     if (!attached())