Changeset 276209 in webkit

Timestamp:

Apr 17, 2021, 3:38:29 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Consider making CSSStyleSheet::rules() just an alias of CSSStyleSheet::cssRules().
​https://bugs.webkit.org/show_bug.cgi?id=197725

Patch by Tyler Wilcock <Tyler Wilcock> on 2021-04-17
Reviewed by Darin Adler.

LayoutTests/imported/w3c:

To match other browsers and the below WPT, CSSStyleSheet.rules now aliases
CSSStyleSheet.cssRulesForBindings, meaning we pass two more tests.

• web-platform-tests/css/cssom/CSSStyleSheet-expected.txt:

Source/WebCore:

To match other browsers (Blink and Gecko) and pass a WPT, CSSStyleSheet.rules now aliases
CSSStyleSheet.cssRulesForBindings. CSSStyleSheet.rulesForBindings is deleted.

Tested by
imported/w3c/web-platform-tests/css/cssom/CSSStyleSheet.html.

• css/CSSStyleSheet.cpp:

(WebCore::CSSStyleSheet::rulesForBindings): Deleted.
(WebCore::CSSStyleSheet::rules): Deleted.

• css/CSSStyleSheet.h:

Change rules() to be an inlined alias for cssRulesForBindings().

• css/CSSStyleSheet.idl:

Remove [ImplementedAs=rulesForBindings], as this function has been
deleted.

Source/WebKit:

CSSStyleSheet.rules has been changed to alias CSSStyleSheet.cssRulesForBindings. Now,
to access just the CSSRuleList, CSSStyleSheet.cssRules must be called.

• WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.cpp:

(webkit_dom_css_style_sheet_get_rules):
Use CSSStyleSheet.cssRules instead of CSSStyleSheet.rules (deleted
with this patch) to get access to the CSSRuleList of this
stylesheet.

Source/WebKitLegacy/mac:

CSSStyleSheet.rules has been changed to alias CSSStyleSheet.cssRulesForBindings. Now,
to access just the CSSRuleList, CSSStyleSheet.cssRules must be called.

• DOM/DOMCSSStyleSheet.mm:

(-[DOMCSSStyleSheet rules]):
Update this function to call IMPL->cssRules instead of IMPL->rules.

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/cssom/CSSStyleSheet-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSheet.cpp (modified) (1 diff)
• Source/WebCore/css/CSSStyleSheet.h (modified) (3 diffs)
• Source/WebCore/css/CSSStyleSheet.idl (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.cpp (modified) (1 diff)
• Source/WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• Source/WebKitLegacy/mac/DOM/DOMCSSStyleSheet.mm (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-04-17  Tyler Wilcock  <twilco.o@protonmail.com>
+
+        Consider making CSSStyleSheet::rules() just an alias of CSSStyleSheet::cssRules().
+        https://bugs.webkit.org/show_bug.cgi?id=197725
+
+        Reviewed by Darin Adler.
+
+        To match other browsers and the below WPT, CSSStyleSheet.rules now aliases
+        CSSStyleSheet.cssRulesForBindings, meaning we pass two more tests.
+
+        * web-platform-tests/css/cssom/CSSStyleSheet-expected.txt:
+
 2021-04-17  Tim Nguyen  <ntim@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom/CSSStyleSheet-expected.txt

@@ -14 +14 @@
 PASS addRule with no argument adds "undefined" selector
 PASS addRule with index greater than length throws
-FAIL cssRules and rules are the same object assert_equals: expected object "[object CSSRuleList]" but got object "[object CSSRuleList]"
+PASS cssRules and rules are the same object
 PASS cssRules returns the same object twice
-FAIL rules returns the same object twice assert_equals: expected object "[object CSSRuleList]" but got object "[object CSSRuleList]"
+PASS rules returns the same object twice
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-17  Tyler Wilcock  <twilco.o@protonmail.com>
+
+        Consider making CSSStyleSheet::rules() just an alias of CSSStyleSheet::cssRules().
+        https://bugs.webkit.org/show_bug.cgi?id=197725
+
+        Reviewed by Darin Adler.
+
+        To match other browsers (Blink and Gecko) and pass a WPT, CSSStyleSheet.rules now aliases
+        CSSStyleSheet.cssRulesForBindings.  CSSStyleSheet.rulesForBindings is deleted.
+
+        Tested by
+        imported/w3c/web-platform-tests/css/cssom/CSSStyleSheet.html.
+
+        * css/CSSStyleSheet.cpp:
+        (WebCore::CSSStyleSheet::rulesForBindings): Deleted.
+        (WebCore::CSSStyleSheet::rules): Deleted.
+
+        * css/CSSStyleSheet.h:
+        Change `rules()` to be an inlined alias for `cssRulesForBindings()`.
+
+        * css/CSSStyleSheet.idl:
+        Remove [ImplementedAs=rulesForBindings], as this function has been
+        deleted.
+
 2021-04-17  Tyler Wilcock  <twilco.o@protonmail.com>
 

trunk/Source/WebCore/css/CSSStyleSheet.cpp

@@ -255 +255 @@
 }
 
-ExceptionOr<Ref<CSSRuleList>> CSSStyleSheet::rulesForBindings()
-{
-    auto rules = this->rules();
-    if (!rules)
-        return Exception { SecurityError, "Not allowed to access cross-origin stylesheet"_s };
-    return rules.releaseNonNull();
-}
-
-RefPtr<CSSRuleList> CSSStyleSheet::rules()
-{
-    if (!canAccessRules())
-        return nullptr;
-    // IE behavior.
-    auto ruleList = StaticCSSRuleList::create();
-    unsigned ruleCount = length();
-    for (unsigned i = 0; i < ruleCount; ++i)
-        ruleList->rules().append(item(i));
-    return ruleList;
-}
-
 ExceptionOr<unsigned> CSSStyleSheet::insertRule(const String& ruleString, unsigned index)
 {

trunk/Source/WebCore/css/CSSStyleSheet.h

@@ -21 +21 @@
 #pragma once
 
+#include "CSSRuleList.h"
 #include "ExceptionOr.h"
 #include "StyleSheet.h"
@@ -34 +35 @@
 class CSSParser;
 class CSSRule;
-class CSSRuleList;
 class CSSStyleSheet;
 class CachedCSSStyleSheet;
@@ -63 +63 @@
     void setDisabled(bool) final;
 
+    WEBCORE_EXPORT RefPtr<CSSRuleList> cssRules();
     ExceptionOr<Ref<CSSRuleList>> cssRulesForBindings();
-    ExceptionOr<Ref<CSSRuleList>> rulesForBindings();
+    ExceptionOr<Ref<CSSRuleList>> rules() { return this->cssRulesForBindings(); }
 
-    WEBCORE_EXPORT RefPtr<CSSRuleList> cssRules();
     WEBCORE_EXPORT ExceptionOr<unsigned> insertRule(const String& rule, unsigned index);
     WEBCORE_EXPORT ExceptionOr<void> deleteRule(unsigned index);
     
-    WEBCORE_EXPORT RefPtr<CSSRuleList> rules();
     WEBCORE_EXPORT ExceptionOr<int> addRule(const String& selector, const String& style, Optional<unsigned> index);
     ExceptionOr<void> removeRule(unsigned index) { return deleteRule(index); }

trunk/Source/WebCore/css/CSSStyleSheet.idl

@@ -27 +27 @@
     undefined deleteRule(unsigned long index);
 
-    [ImplementedAs=rulesForBindings] readonly attribute CSSRuleList rules;
+    readonly attribute CSSRuleList rules;
     long addRule(optional DOMString selector = "undefined", optional DOMString style = "undefined", optional unsigned long index);
     undefined removeRule(optional unsigned long index = 0);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-17  Tyler Wilcock  <twilco.o@protonmail.com>
+
+        Consider making CSSStyleSheet::rules() just an alias of CSSStyleSheet::cssRules().
+        https://bugs.webkit.org/show_bug.cgi?id=197725
+
+        Reviewed by Darin Adler.
+
+        CSSStyleSheet.rules has been changed to alias CSSStyleSheet.cssRulesForBindings.  Now,
+        to access just the CSSRuleList, CSSStyleSheet.cssRules must be called.
+
+        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.cpp:
+        (webkit_dom_css_style_sheet_get_rules):
+        Use CSSStyleSheet.cssRules instead of CSSStyleSheet.rules (deleted
+        with this patch) to get access to the CSSRuleList of this
+        stylesheet.
+
 2021-04-17  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMCSSStyleSheet.cpp

@@ -213 +213 @@
     g_return_val_if_fail(WEBKIT_DOM_IS_CSS_STYLE_SHEET(self), 0);
     WebCore::CSSStyleSheet* item = WebKit::core(self);
-    RefPtr<WebCore::CSSRuleList> gobjectResult = WTF::getPtr(item->rules());
+    RefPtr<WebCore::CSSRuleList> gobjectResult = WTF::getPtr(item->cssRules());
     return WebKit::kit(gobjectResult.get());
 }

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2021-04-17  Tyler Wilcock  <twilco.o@protonmail.com>
+
+        Consider making CSSStyleSheet::rules() just an alias of CSSStyleSheet::cssRules().
+        https://bugs.webkit.org/show_bug.cgi?id=197725
+
+        Reviewed by Darin Adler.
+
+        CSSStyleSheet.rules has been changed to alias CSSStyleSheet.cssRulesForBindings.  Now,
+        to access just the CSSRuleList, CSSStyleSheet.cssRules must be called.
+
+        * DOM/DOMCSSStyleSheet.mm:
+        (-[DOMCSSStyleSheet rules]):
+        Update this function to call IMPL->cssRules instead of IMPL->rules.
+
 2021-04-16  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKitLegacy/mac/DOM/DOMCSSStyleSheet.mm

@@ -60 +60 @@
 {
     WebCore::JSMainThreadNullState state;
-    return kit(WTF::getPtr(IMPL->rules()));
+    // Calling IMPL->cssRules (not IMPL->rules) is intentional, as `rules` should just be an alias for `cssRules`.
+    // See https://bugs.webkit.org/show_bug.cgi?id=197725 for more information.
+    return kit(WTF::getPtr(IMPL->cssRules()));
 }