Changeset 87317 in webkit

Timestamp:

May 25, 2011 1:32:37 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-05-25 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by James Robinson.

CSSStyleSelector should provide a way to obtain rules from non-author stylesheets
​https://bugs.webkit.org/show_bug.cgi?id=61454

Replaced bool and enum arguments of styleRulesForElement and pseudoStyleRulesForElement
by one enum, and provided a way to obtain rules from UA/user stylesheets.

• css/CSSRule.h: Removed CSSRuleFilter.
• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::styleRulesForElement): See above. (WebCore::CSSStyleSelector::pseudoStyleRulesForElement): Ditto.
• css/CSSStyleSelector.h: Moved CSSRuleFilter here.
• editing/markup.cpp: (WebCore::styleFromMatchedRulesForElement): Calls styleRulesForElement.
• inspector/InspectorCSSAgent.cpp: (WebCore::InspectorCSSAgent::getStylesForNode): Ditto.
• page/DOMWindow.cpp: (WebCore::DOMWindow::getMatchedCSSRules): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSRule.h (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (3 diffs)
• css/CSSStyleSelector.h (modified) (1 diff)
• editing/markup.cpp (modified) (1 diff)
• inspector/InspectorCSSAgent.cpp (modified) (3 diffs)
• page/DOMWindow.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-25  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by James Robinson.
+
+        CSSStyleSelector should provide a way to obtain rules from non-author stylesheets
+        https://bugs.webkit.org/show_bug.cgi?id=61454
+
+        Replaced bool and enum arguments of styleRulesForElement and pseudoStyleRulesForElement
+        by one enum, and provided a way to obtain rules from UA/user stylesheets.
+
+        * css/CSSRule.h: Removed CSSRuleFilter.
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::styleRulesForElement): See above.
+        (WebCore::CSSStyleSelector::pseudoStyleRulesForElement): Ditto.
+        * css/CSSStyleSelector.h: Moved CSSRuleFilter here.
+        * editing/markup.cpp:
+        (WebCore::styleFromMatchedRulesForElement): Calls styleRulesForElement.
+        * inspector/InspectorCSSAgent.cpp:
+        (WebCore::InspectorCSSAgent::getStylesForNode): Ditto.
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::getMatchedCSSRules): Ditto.
+
 2011-05-25  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WebCore/css/CSSRule.h

@@ -30 +30 @@
 
 typedef int ExceptionCode;
-
-enum CSSRuleFilter {
-    AllCSSRules,
-    SameOriginCSSRulesOnly
-}; 
 
 class CSSRule : public StyleBase {

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -1992 +1992 @@
 }
 
-PassRefPtr<CSSRuleList> CSSStyleSelector::styleRulesForElement(Element* e, bool authorOnly, bool includeEmptyRules, CSSRuleFilter filter)
-{
-    return pseudoStyleRulesForElement(e, NOPSEUDO, authorOnly, includeEmptyRules, filter);
-}
-
-PassRefPtr<CSSRuleList> CSSStyleSelector::pseudoStyleRulesForElement(Element* e, PseudoId pseudoId, bool authorOnly, bool includeEmptyRules, CSSRuleFilter filter)
+PassRefPtr<CSSRuleList> CSSStyleSelector::styleRulesForElement(Element* e, unsigned rulesToInclude)
+{
+    return pseudoStyleRulesForElement(e, NOPSEUDO, rulesToInclude);
+}
+
+PassRefPtr<CSSRuleList> CSSStyleSelector::pseudoStyleRulesForElement(Element* e, PseudoId pseudoId, unsigned rulesToInclude)
 {
     if (!e || !e->document()->haveStylesheetsLoaded())
@@ -2007 +2007 @@
     initForStyleResolve(e, 0, pseudoId);
 
-    if (!authorOnly) {
+    if (rulesToInclude & UAAndUserCSSRules) {
         int firstUARule = -1, lastUARule = -1;
         // First we match rules from the user agent sheet.
@@ -2015 +2015 @@
         if (m_matchAuthorAndUserStyles) {
             int firstUserRule = -1, lastUserRule = -1;
-            matchRules(m_userStyle.get(), firstUserRule, lastUserRule, includeEmptyRules);
+            matchRules(m_userStyle.get(), firstUserRule, lastUserRule, rulesToInclude & EmptyCSSRules);
         }
     }
 
     if (m_matchAuthorAndUserStyles) {
-        m_checker.m_sameOriginOnly = (filter == SameOriginCSSRulesOnly);
+        m_checker.m_sameOriginOnly = !(rulesToInclude & CrossOriginCSSRules);
 
         // Check the rules in author sheets.
         int firstAuthorRule = -1, lastAuthorRule = -1;
-        matchRules(m_authorStyle.get(), firstAuthorRule, lastAuthorRule, includeEmptyRules);
+        matchRules(m_authorStyle.get(), firstAuthorRule, lastAuthorRule, rulesToInclude & EmptyCSSRules);
 
         m_checker.m_sameOriginOnly = false;

trunk/Source/WebCore/css/CSSStyleSelector.h

@@ -129 +129 @@
     public:
         // These methods will give back the set of rules that matched for a given element (or a pseudo-element).
-        PassRefPtr<CSSRuleList> styleRulesForElement(Element*, bool authorOnly, bool includeEmptyRules = false, CSSRuleFilter filter = AllCSSRules);
-        PassRefPtr<CSSRuleList> pseudoStyleRulesForElement(Element*, PseudoId, bool authorOnly, bool includeEmptyRules = false, CSSRuleFilter filter = AllCSSRules);
+        enum CSSRuleFilter {
+            UAAndUserCSSRules   = 1 << 1,
+            AuthorCSSRules      = 1 << 2,
+            EmptyCSSRules       = 1 << 3,
+            CrossOriginCSSRules = 1 << 4,
+            AllButEmptyCSSRules = UAAndUserCSSRules | AuthorCSSRules | CrossOriginCSSRules,
+            AllCSSRules         = AllButEmptyCSSRules | EmptyCSSRules,
+        };
+        PassRefPtr<CSSRuleList> styleRulesForElement(Element*, unsigned rulesToInclude = AllButEmptyCSSRules);
+        PassRefPtr<CSSRuleList> pseudoStyleRulesForElement(Element*, PseudoId, unsigned rulesToInclude = AllButEmptyCSSRules);
 
         // Given a CSS keyword in the range (xx-small to -webkit-xxx-large), this function will return

trunk/Source/WebCore/editing/markup.cpp

@@ -240 +240 @@
 }
 
-static PassRefPtr<CSSMutableStyleDeclaration> styleFromMatchedRulesForElement(Element* element, bool authorOnly = true)
+static PassRefPtr<CSSMutableStyleDeclaration> styleFromMatchedRulesForElement(Element* element)
 {
     RefPtr<CSSMutableStyleDeclaration> style = CSSMutableStyleDeclaration::create();
-    RefPtr<CSSRuleList> matchedRules = element->document()->styleSelector()->styleRulesForElement(element, authorOnly);
+    RefPtr<CSSRuleList> matchedRules = element->document()->styleSelector()->styleRulesForElement(element,
+        CSSStyleSelector::AuthorCSSRules | CSSStyleSelector::CrossOriginCSSRules);
     if (matchedRules) {
         for (unsigned i = 0; i < matchedRules->length(); i++) {

trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp

@@ -200 +200 @@
 
     CSSStyleSelector* selector = element->ownerDocument()->styleSelector();
-    RefPtr<CSSRuleList> matchedRules = selector->styleRulesForElement(element, false, true);
+    RefPtr<CSSRuleList> matchedRules = selector->styleRulesForElement(element, CSSStyleSelector::AllCSSRules);
     resultObject->setArray("matchedCSSRules", buildArrayForRuleList(matchedRules.get()));
 
@@ -207 +207 @@
     RefPtr<InspectorArray> pseudoElements = InspectorArray::create();
     for (PseudoId pseudoId = FIRST_PUBLIC_PSEUDOID; pseudoId < AFTER_LAST_INTERNAL_PSEUDOID; pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
-        RefPtr<CSSRuleList> matchedRules = selector->pseudoStyleRulesForElement(element, pseudoId, false, true);
+        RefPtr<CSSRuleList> matchedRules = selector->pseudoStyleRulesForElement(element, pseudoId, CSSStyleSelector::AllCSSRules);
         if (matchedRules && matchedRules->length()) {
             RefPtr<InspectorObject> pseudoStyles = InspectorObject::create();
@@ -228 +228 @@
 
         CSSStyleSelector* parentSelector = parentElement->ownerDocument()->styleSelector();
-        RefPtr<CSSRuleList> parentMatchedRules = parentSelector->styleRulesForElement(parentElement, false, true);
+        RefPtr<CSSRuleList> parentMatchedRules = parentSelector->styleRulesForElement(parentElement, CSSStyleSelector::AllCSSRules);
         parentStyle->setArray("matchedCSSRules", buildArrayForRuleList(parentMatchedRules.get()));
         inheritedStyles->pushObject(parentStyle.release());

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1292 +1292 @@
 }
 
-PassRefPtr<CSSRuleList> DOMWindow::getMatchedCSSRules(Element* elt, const String&, bool authorOnly) const
-{
-    if (!m_frame)
-        return 0;
-
-    Settings* settings = m_frame->settings();
-    return m_frame->document()->styleSelector()->styleRulesForElement(elt, authorOnly, false, settings && settings->crossOriginCheckInGetMatchedCSSRulesDisabled() ? AllCSSRules : SameOriginCSSRulesOnly);
+PassRefPtr<CSSRuleList> DOMWindow::getMatchedCSSRules(Element* element, const String&, bool authorOnly) const
+{
+    if (!m_frame)
+        return 0;
+
+    unsigned rulesToInclude = CSSStyleSelector::AuthorCSSRules;
+    if (!authorOnly)
+        rulesToInclude |= CSSStyleSelector::UAAndUserCSSRules;
+    if (Settings* settings = m_frame->settings()) {
+        if (settings->crossOriginCheckInGetMatchedCSSRulesDisabled())
+            rulesToInclude |= CSSStyleSelector::CrossOriginCSSRules;
+    }
+
+    return m_frame->document()->styleSelector()->styleRulesForElement(element, rulesToInclude);
 }