Changeset 144025 in webkit

Timestamp:

Feb 26, 2013, 1:15:17 AM (14 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: CSSAgent.setStyleSheetText crashes on inline styles
​https://bugs.webkit.org/show_bug.cgi?id=110359

Reviewed by Pavel Feldman.

Source/WebCore:

• inspector/InspectorCSSAgent.cpp:

(WebCore::InspectorCSSAgent::SetStyleSheetTextAction::undo): Pass ExceptionCode into setText().
(WebCore::InspectorCSSAgent::SetStyleSheetTextAction::redo): Ditto.

• inspector/InspectorStyleSheet.cpp:

(WebCore::InspectorStyleSheet::setText): Make use of checkPageStyleSheet().
(WebCore::InspectorStyleSheet::setRuleSelector): Ditto.
(WebCore::InspectorStyleSheet::addRule): Ditto.
(WebCore::InspectorStyleSheet::deleteRule): Ditto.
(WebCore::InspectorStyleSheet::checkPageStyleSheet):

Return NOT_SUPPORTED_ERR if no m_pageStyleSheet.

(WebCore::InspectorStyleSheet::setStyleText): Check field directly.

• inspector/InspectorStyleSheet.h:

LayoutTests:

• inspector/styles/styles-new-API-expected.txt:
• inspector/styles/styles-new-API.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/styles/styles-new-API-expected.txt (modified) (1 diff)
• LayoutTests/inspector/styles/styles-new-API.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorCSSAgent.cpp (modified) (2 diffs)
• Source/WebCore/inspector/InspectorStyleSheet.cpp (modified) (8 diffs)
• Source/WebCore/inspector/InspectorStyleSheet.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-26  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: CSSAgent.setStyleSheetText crashes on inline styles
+        https://bugs.webkit.org/show_bug.cgi?id=110359
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/styles/styles-new-API-expected.txt:
+        * inspector/styles/styles-new-API.html:
+
 2013-02-26  Tien-Ren Chen  <trchen@chromium.org>
 

trunk/LayoutTests/inspector/styles/styles-new-API-expected.txt

@@ -134 +134 @@
 === Attributes style for table ===
 ['width':'50%'] @[undefined-undefined] style
+
+=== Stylesheet-for-inline-style text ===
+
+
+=== Stylesheet-for-inline-style modification result ===
+NotSupportedError
 
 === All stylesheets ===

trunk/LayoutTests/inspector/styles/styles-new-API.html

@@ -119 +119 @@
             InspectorTest.addResult("=== Attributes style for table ===");
             InspectorTest.dumpStyle(attributesStyle);
+            test_inlineStyleSheetModification(inlineStyle);
+        }
+
+        function nodeCallback(node)
+        {
+            CSSAgent.getInlineStylesForNode(node.id, callback);
+        }
+        InspectorTest.nodeWithId("thetable", nodeCallback);
+    }
+
+    function test_inlineStyleSheetModification(inlineStyle)
+    {
+        CSSAgent.getStyleSheetText(inlineStyle.styleId.styleSheetId, textCallback);
+
+        function textCallback(error, result)
+        {
+            InspectorTest.addResult("");
+            InspectorTest.addResult("=== Stylesheet-for-inline-style text ===");
+            InspectorTest.addResult(result);
+            CSSAgent.setStyleSheetText(inlineStyle.styleId.styleSheetId, "", setTextCallback);
+        }
+
+        function setTextCallback(error, result)
+        {
+            InspectorTest.addResult("");
+            InspectorTest.addResult("=== Stylesheet-for-inline-style modification result ===");
+            InspectorTest.addResult(error);
             test_styleSheets();
         }
-
-        function nodeCallback(node)
-        {
-            CSSAgent.getInlineStylesForNode(node.id, callback);
-        }
-        InspectorTest.nodeWithId("thetable", nodeCallback);
     }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-26  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: CSSAgent.setStyleSheetText crashes on inline styles
+        https://bugs.webkit.org/show_bug.cgi?id=110359
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/InspectorCSSAgent.cpp:
+        (WebCore::InspectorCSSAgent::SetStyleSheetTextAction::undo): Pass ExceptionCode into setText().
+        (WebCore::InspectorCSSAgent::SetStyleSheetTextAction::redo): Ditto.
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::InspectorStyleSheet::setText): Make use of checkPageStyleSheet().
+        (WebCore::InspectorStyleSheet::setRuleSelector): Ditto.
+        (WebCore::InspectorStyleSheet::addRule): Ditto.
+        (WebCore::InspectorStyleSheet::deleteRule): Ditto.
+        (WebCore::InspectorStyleSheet::checkPageStyleSheet):
+          Return NOT_SUPPORTED_ERR if no m_pageStyleSheet.
+        (WebCore::InspectorStyleSheet::setStyleText): Check field directly.
+        * inspector/InspectorStyleSheet.h:
+
 2013-02-26  Tien-Ren Chen  <trchen@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp

@@ -319 +319 @@
     }
 
-    virtual bool undo(ExceptionCode&)
-    {
-        if (m_styleSheet->setText(m_oldText)) {
+    virtual bool undo(ExceptionCode& ec)
+    {
+        if (m_styleSheet->setText(m_oldText, ec)) {
             m_styleSheet->reparseStyleSheet(m_oldText);
             return true;
@@ -328 +328 @@
     }
 
-    virtual bool redo(ExceptionCode&)
-    {
-        if (m_styleSheet->setText(m_text)) {
+    virtual bool redo(ExceptionCode& ec)
+    {
+        if (m_styleSheet->setText(m_text, ec)) {
             m_styleSheet->reparseStyleSheet(m_text);
             return true;

trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -781 +781 @@
 }
 
-bool InspectorStyleSheet::setText(const String& text)
-{
+bool InspectorStyleSheet::setText(const String& text, ExceptionCode& ec)
+{
+    if (!checkPageStyleSheet(ec))
+        return false;
     if (!m_parsedStyleSheet)
         return false;
@@ -804 +806 @@
 bool InspectorStyleSheet::setRuleSelector(const InspectorCSSId& id, const String& selector, ExceptionCode& ec)
 {
+    if (!checkPageStyleSheet(ec))
+        return false;
     CSSStyleRule* rule = ruleForId(id);
     if (!rule) {
@@ -838 +842 @@
 CSSStyleRule* InspectorStyleSheet::addRule(const String& selector, ExceptionCode& ec)
 {
+    if (!checkPageStyleSheet(ec))
+        return 0;
     if (!checkStyleRuleSelector(m_pageStyleSheet->ownerDocument(), selector)) {
         ec = SYNTAX_ERR;
@@ -875 +881 @@
     styleSheetText.appendLiteral(" {}");
     // Using setText() as this operation changes the style sheet rule set.
-    setText(styleSheetText.toString());
+    setText(styleSheetText.toString(), ASSERT_NO_EXCEPTION);
 
     fireStyleSheetChanged();
@@ -884 +890 @@
 bool InspectorStyleSheet::deleteRule(const InspectorCSSId& id, ExceptionCode& ec)
 {
+    if (!checkPageStyleSheet(ec))
+        return false;
     RefPtr<CSSStyleRule> rule = ruleForId(id);
     if (!rule) {
@@ -909 +917 @@
     String sheetText = m_parsedStyleSheet->text();
     sheetText.remove(sourceData->ruleHeaderRange.start, sourceData->ruleBodyRange.end - sourceData->ruleHeaderRange.start + 1);
-    setText(sheetText);
+    setText(sheetText, ASSERT_NO_EXCEPTION);
     fireStyleSheetChanged();
     return true;
@@ -1178 +1186 @@
 }
 
+bool InspectorStyleSheet::checkPageStyleSheet(ExceptionCode& ec) const
+{
+    if (!m_pageStyleSheet) {
+        ec = NOT_SUPPORTED_ERR;
+        return false;
+    }
+    return true;
+}
+
 bool InspectorStyleSheet::ensureParsedDataReady()
 {
@@ -1223 +1240 @@
 bool InspectorStyleSheet::setStyleText(CSSStyleDeclaration* style, const String& text)
 {
-    if (!pageStyleSheet())
+    if (!m_pageStyleSheet)
         return false;
     if (!ensureParsedDataReady())

trunk/Source/WebCore/inspector/InspectorStyleSheet.h

@@ -186 +186 @@
     CSSStyleSheet* pageStyleSheet() const { return m_pageStyleSheet.get(); }
     void reparseStyleSheet(const String&);
-    bool setText(const String&);
+    bool setText(const String&, ExceptionCode&);
     String ruleSelector(const InspectorCSSId&, ExceptionCode&);
     bool setRuleSelector(const InspectorCSSId&, const String& selector, ExceptionCode&);
@@ -227 +227 @@
 
     static void collectFlatRules(PassRefPtr<CSSRuleList>, CSSStyleRuleVector* result);
+    bool checkPageStyleSheet(ExceptionCode&) const;
     bool ensureText() const;
     bool ensureSourceData();