Changeset 115164 in webkit

Timestamp:

Apr 24, 2012 8:25:14 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

getMatchedCSSRules() should return null when the second argument is an unrecognized pseudo-element name
​https://bugs.webkit.org/show_bug.cgi?id=83298

Patch by Kulanthaivel Palanichamy <​kulanthaivel@codeaurora.org> on 2012-04-24
Reviewed by Ojan Vafai.

Source/WebCore:

I couldn't find any specification or any meaningful discussion on this API, but I
assume that it shouldn't be any different from window.getComputedStyle()
as far as the parameters are concerned.

Test: fast/dom/Window/getMatchedCSSRules-with-invalid-pseudo-elements.html

• page/DOMWindow.cpp:

(WebCore::DOMWindow::getMatchedCSSRules):

• page/DOMWindow.idl:

LayoutTests:

• fast/dom/Window/getMatchedCSSRules-with-invalid-pseudo-elements-expected.txt: Added.
• fast/dom/Window/getMatchedCSSRules-with-invalid-pseudo-elements.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Window/getMatchedCSSRules-with-invalid-pseudo-elements-expected.txt (added)
• LayoutTests/fast/dom/Window/getMatchedCSSRules-with-invalid-pseudo-elements.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/DOMWindow.cpp (modified) (2 diffs)
• Source/WebCore/page/DOMWindow.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-24  Kulanthaivel Palanichamy  <kulanthaivel@codeaurora.org>
+
+        getMatchedCSSRules() should return null when the second argument is an unrecognized pseudo-element name
+        https://bugs.webkit.org/show_bug.cgi?id=83298
+
+        Reviewed by Ojan Vafai.
+
+        * fast/dom/Window/getMatchedCSSRules-with-invalid-pseudo-elements-expected.txt: Added.
+        * fast/dom/Window/getMatchedCSSRules-with-invalid-pseudo-elements.html: Added.
+
 2012-04-24  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-24  Kulanthaivel Palanichamy  <kulanthaivel@codeaurora.org>
+
+        getMatchedCSSRules() should return null when the second argument is an unrecognized pseudo-element name
+        https://bugs.webkit.org/show_bug.cgi?id=83298
+
+        Reviewed by Ojan Vafai.
+
+        I couldn't find any specification or any meaningful discussion on this API, but I
+        assume that it shouldn't be any different from window.getComputedStyle()
+        as far as the parameters are concerned.
+
+        Test: fast/dom/Window/getMatchedCSSRules-with-invalid-pseudo-elements.html
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::getMatchedCSSRules):
+        * page/DOMWindow.idl:
+
 2012-04-24  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1288 +1288 @@
         return 0;
 
+    unsigned colonStart = pseudoElement[0] == ':' ? (pseudoElement[1] == ':' ? 2 : 1) : 0;
+    CSSSelector::PseudoType pseudoType = CSSSelector::parsePseudoType(AtomicString(pseudoElement.substring(colonStart)));
+    if (pseudoType == CSSSelector::PseudoUnknown && !pseudoElement.isEmpty())
+        return 0;
+
     unsigned rulesToInclude = StyleResolver::AuthorCSSRules;
     if (!authorOnly)
@@ -1295 +1300 @@
             rulesToInclude |= StyleResolver::CrossOriginCSSRules;
     }
-    
-    PseudoId pseudoId = CSSSelector::pseudoId(CSSSelector::parsePseudoType(pseudoElement));
- 
+
+    PseudoId pseudoId = CSSSelector::pseudoId(pseudoType);
+
     return m_frame->document()->styleResolver()->pseudoStyleRulesForElement(element, pseudoId, rulesToInclude);
 }

trunk/Source/WebCore/page/DOMWindow.idl

@@ -154 +154 @@
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
         CSSRuleList getMatchedCSSRules(in [Optional=DefaultIsUndefined] Element element,
-                                       in [Optional=DefaultIsUndefined] DOMString pseudoElement);
+                                       in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=DefaultIsUndefined] DOMString pseudoElement);
 #endif