DevTools: introduce CSS.setStyleText, we'll migrate setPropertyText to it later.

Source/core/inspector/InspectorCSSAgent.cpp

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 272 matching lines @@
     unsigned m_propertyIndex;
     String m_text;
     String m_oldStyleText;
     String m_newStyleText;
     bool m_overwrite;
 };
 
 class InspectorCSSAgent::SetRuleSelectorOrMediaAction final : public InspectorCSSAgent::StyleSheetAction {
     WTF_MAKE_NONCOPYABLE(SetRuleSelectorOrMediaAction);
 public:
-    SetRuleSelectorOrMediaAction(bool isMedia, InspectorStyleSheet* styleSheet, const SourceRange& range, const String& text)
+    enum Type {
+        SetRuleSelector,
+        SetStyleText,
+        SetMediaRuleText
+    };
+
+    SetRuleSelectorOrMediaAction(Type type, InspectorStyleSheet* styleSheet, const SourceRange& range, const String& text)

[lushnikov, 2015/06/17 13:55:10]

SetModelTextAction?

[pfeldman, 2015/06/18 13:01:55]

Done.

         : InspectorCSSAgent::StyleSheetAction("SetRuleSelectorOrMediaAction")
         , m_styleSheet(styleSheet)
-        , m_isMedia(isMedia)
+        , m_type(type)
         , m_range(range)
         , m_text(text)
         , m_cssRule(nullptr)
     {
     }
 
     virtual bool perform(ExceptionState& exceptionState) override
     {
         return redo(exceptionState);
     }
 
     virtual bool undo(ExceptionState& exceptionState) override
     {
-        if (m_isMedia)
+        switch (m_type) {
+        case SetRuleSelector:
+            return m_styleSheet->setRuleSelector(m_newRange, m_oldText, nullptr, nullptr, exceptionState);
+        case SetStyleText:
+            return m_styleSheet->setStyleText(m_newRange, m_oldText, nullptr, nullptr, exceptionState);
+        case SetMediaRuleText:
             return m_styleSheet->setMediaRuleText(m_newRange, m_oldText, nullptr, nullptr, exceptionState);
-        return m_styleSheet->setRuleSelector(m_newRange, m_oldText, nullptr, nullptr, exceptionState);
+        default:
+            ASSERT_NOT_REACHED();
+        }
     }
 
     virtual bool redo(ExceptionState& exceptionState) override
     {
-        if (m_isMedia)
+        switch (m_type) {
+        case SetRuleSelector:
+            m_cssRule = m_styleSheet->setRuleSelector(m_range, m_text, &m_newRange, &m_oldText, exceptionState);
+            break;
+        case SetStyleText:
+            m_cssRule = m_styleSheet->setStyleText(m_range, m_text, &m_newRange, &m_oldText, exceptionState);
+            break;
+        case SetMediaRuleText:
             m_cssRule = m_styleSheet->setMediaRuleText(m_range, m_text, &m_newRange, &m_oldText, exceptionState);
-        else
-            m_cssRule = m_styleSheet->setRuleSelector(m_range, m_text, &m_newRange, &m_oldText, exceptionState);
+            break;
+        default:
+            ASSERT_NOT_REACHED();
+        }
         return m_cssRule;
     }
 
     RefPtrWillBeRawPtr<CSSRule> takeRule()
     {
         RefPtrWillBeRawPtr<CSSRule> result = m_cssRule;
         m_cssRule = nullptr;
         return result;
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_styleSheet);
         visitor->trace(m_cssRule);
         InspectorCSSAgent::StyleSheetAction::trace(visitor);
     }
 
 private:
     RefPtrWillBeMember<InspectorStyleSheet> m_styleSheet;
-    bool m_isMedia;
+    Type m_type;
     SourceRange m_range;
     String m_text;
     String m_oldText;
     SourceRange m_newRange;
     RefPtrWillBeMember<CSSRule> m_cssRule;
 };
 
 class InspectorCSSAgent::AddRuleAction final : public InspectorCSSAgent::StyleSheetAction {
     WTF_MAKE_NONCOPYABLE(AddRuleAction);
 public:
@@ skipping 608 matching lines @@
     InspectorStyleSheet* inspectorStyleSheet = assertInspectorStyleSheetForId(errorString, styleSheetId);
     if (!inspectorStyleSheet) {
         *errorString = "Stylesheet not found";
         return;
     }
     SourceRange selectorRange;
     if (!jsonRangeToSourceRange(errorString, inspectorStyleSheet, range, &selectorRange))
         return;
 
     TrackExceptionState exceptionState;
-    RefPtrWillBeRawPtr<SetRuleSelectorOrMediaAction> action = adoptRefWillBeNoop(new SetRuleSelectorOrMediaAction(false, inspectorStyleSheet, selectorRange, selector));
+    RefPtrWillBeRawPtr<SetRuleSelectorOrMediaAction> action = adoptRefWillBeNoop(new SetRuleSelectorOrMediaAction(SetRuleSelectorOrMediaAction::SetRuleSelector, inspectorStyleSheet, selectorRange, selector));
     bool success = m_domAgent->history()->perform(action, exceptionState);
     if (success) {
         RefPtrWillBeRawPtr<CSSStyleRule> rule = InspectorCSSAgent::asCSSStyleRule(action->takeRule().get());
+        result = inspectorStyleSheet->buildObjectForRule(rule.get(), buildMediaListChain(rule.get()));
+    }
+    *errorString = InspectorDOMAgent::toErrorString(exceptionState);
+}
+
+void InspectorCSSAgent::setStyleText(ErrorString* errorString, const String& styleSheetId, const RefPtr<JSONObject>& range, const String& text, RefPtr<TypeBuilder::CSS::CSSRule>& result)
+{
+    InspectorStyleSheet* inspectorStyleSheet = assertInspectorStyleSheetForId(errorString, styleSheetId);

[lushnikov, 2015/06/17 13:55:10]

you want inspectorStyleSheetBase here

[pfeldman, 2015/06/18 13:01:55]

Not really, plugged in differently.

+    if (!inspectorStyleSheet) {
+        *errorString = "Stylesheet not found";
+        return;
+    }
+    SourceRange selectorRange;
+    if (!jsonRangeToSourceRange(errorString, inspectorStyleSheet, range, &selectorRange))
+        return;
+
+    TrackExceptionState exceptionState;
+    RefPtrWillBeRawPtr<SetRuleSelectorOrMediaAction> action = adoptRefWillBeNoop(new SetRuleSelectorOrMediaAction(SetRuleSelectorOrMediaAction::SetStyleText, inspectorStyleSheet, selectorRange, text));
+    bool success = m_domAgent->history()->perform(action, exceptionState);
+    if (success) {
+        RefPtrWillBeRawPtr<CSSStyleRule> rule = InspectorCSSAgent::asCSSStyleRule(action->takeRule().get());
         result = inspectorStyleSheet->buildObjectForRule(rule.get(), buildMediaListChain(rule.get()));
     }
     *errorString = InspectorDOMAgent::toErrorString(exceptionState);
 }
 
 void InspectorCSSAgent::setMediaText(ErrorString* errorString, const String& styleSheetId, const RefPtr<JSONObject>& range, const String& text, RefPtr<TypeBuilder::CSS::CSSMedia>& result)
 {
     InspectorStyleSheet* inspectorStyleSheet = assertInspectorStyleSheetForId(errorString, styleSheetId);
     if (!inspectorStyleSheet) {
         *errorString = "Stylesheet not found";
         return;
     }
     SourceRange textRange;
     if (!jsonRangeToSourceRange(errorString, inspectorStyleSheet, range, &textRange))
         return;
 
     TrackExceptionState exceptionState;
-    RefPtrWillBeRawPtr<SetRuleSelectorOrMediaAction> action = adoptRefWillBeNoop(new SetRuleSelectorOrMediaAction(true, inspectorStyleSheet, textRange, text));
+    RefPtrWillBeRawPtr<SetRuleSelectorOrMediaAction> action = adoptRefWillBeNoop(new SetRuleSelectorOrMediaAction(SetRuleSelectorOrMediaAction::SetMediaRuleText, inspectorStyleSheet, textRange, text));
     bool success = m_domAgent->history()->perform(action, exceptionState);
     if (success) {
         RefPtrWillBeRawPtr<CSSMediaRule> rule = InspectorCSSAgent::asCSSMediaRule(action->takeRule().get());
         String sourceURL = rule->parentStyleSheet()->contents()->baseURL();
         if (sourceURL.isEmpty())
             sourceURL = InspectorDOMAgent::documentURLString(rule->parentStyleSheet()->ownerDocument());
         result = buildMediaObject(rule->media(), MediaListSourceMediaRule, sourceURL, rule->parentStyleSheet());
     }
     *errorString = InspectorDOMAgent::toErrorString(exceptionState);
 }
@@ skipping 557 matching lines @@
     visitor->trace(m_invalidatedDocuments);
     visitor->trace(m_nodeToInspectorStyleSheet);
     visitor->trace(m_documentToViaInspectorStyleSheet);
 #endif
     visitor->trace(m_inspectorUserAgentStyleSheet);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink