Changeset 112083 in webkit

Timestamp:

Mar 26, 2012 6:07:24 AM (12 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: [REGRESSION] Workarounds for security checks when retrieving stylesheet rule lists are broken
​https://bugs.webkit.org/show_bug.cgi?id=82191

Reviewed by Vsevolod Vlasov.

Source/WebCore:

Test: http/tests/inspector/modify-cross-domain-rule.html

• inspector/InspectorStyleSheet.cpp:

(WebCore::asCSSRuleList):
(WebCore::InspectorStyleSheet::buildObjectForStyleSheet):

LayoutTests:

• http/tests/inspector/modify-cross-domain-rule-expected.txt: Added.
• http/tests/inspector/modify-cross-domain-rule.html: Added.
• http/tests/inspector/styles/modify-cross-domain-rule.css: Added.

(#inspected):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/modify-cross-domain-rule-expected.txt (added)
• LayoutTests/http/tests/inspector/modify-cross-domain-rule.html (added)
• LayoutTests/http/tests/inspector/styles/modify-cross-domain-rule.css (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorStyleSheet.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-26  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [REGRESSION] Workarounds for security checks when retrieving stylesheet rule lists are broken
+        https://bugs.webkit.org/show_bug.cgi?id=82191
+
+        Reviewed by Vsevolod Vlasov.
+
+        * http/tests/inspector/modify-cross-domain-rule-expected.txt: Added.
+        * http/tests/inspector/modify-cross-domain-rule.html: Added.
+        * http/tests/inspector/styles/modify-cross-domain-rule.css: Added.
+        (#inspected):
+
 2012-03-26  Szilard Ledan  <szledan@inf.u-szeged.hu>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-26  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [REGRESSION] Workarounds for security checks when retrieving stylesheet rule lists are broken
+        https://bugs.webkit.org/show_bug.cgi?id=82191
+
+        Reviewed by Vsevolod Vlasov.
+
+        Test: http/tests/inspector/modify-cross-domain-rule.html
+
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::asCSSRuleList):
+        (WebCore::InspectorStyleSheet::buildObjectForStyleSheet):
+
 2012-03-26  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -154 +154 @@
         return 0;
 
-    return styleSheet->cssRules();
+    RefPtr<StaticCSSRuleList> list = StaticCSSRuleList::create();
+    Vector<RefPtr<CSSRule> >& listRules = list->rules();
+    for (unsigned i = 0, size = styleSheet->length(); i < size; ++i) {
+        CSSRule* item = styleSheet->item(i);
+        if (item->isCharsetRule())
+            continue;
+        listRules.append(item);
+    }
+    return list.release();
 }
 
@@ -836 +844 @@
     RefPtr<InspectorObject> result = InspectorObject::create();
     result->setString("styleSheetId", id());
-    RefPtr<CSSRuleList> cssRuleList = styleSheet->cssRules();
+    RefPtr<CSSRuleList> cssRuleList = asCSSRuleList(styleSheet);
     RefPtr<InspectorArray> cssRules = buildArrayForRuleList(cssRuleList.get());
     result->setArray("rules", cssRules.release());