Devtools [LayoutEditor]: Patch values in the selected rule

Source/core/inspector/LayoutEditor.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/inspector/LayoutEditor.h"
 
 #include "core/css/CSSComputedStyleDeclaration.h"
 #include "core/css/CSSImportRule.h"
 #include "core/css/CSSMediaRule.h"
@@ skipping 275 matching lines @@
         break;
     }
     m_propertyInitialValue = cssValue ? cssValue->getFloatValue() : 0;
 }
 
 void LayoutEditor::overlayPropertyChanged(float cssDelta)
 {
     if (m_changingProperty && m_factor) {
         String errorString;
         float newValue = toValidValue(m_changingProperty, cssDelta / m_factor + m_propertyInitialValue);
-        m_cssAgent->setCSSPropertyValue(&errorString, m_element.get(), m_changingProperty, truncateZeroes(String::format("%.2f", newValue)) + CSSPrimitiveValue::unitTypeToString(m_valueUnitType));
+        m_cssAgent->setCSSPropertyValueInRule(&errorString, m_element.get(), m_currentRuleIndex == -1 ? nullptr : m_matchedRules[m_currentRuleIndex].get(), m_changingProperty, truncateZeroes(String::format("%.2f", newValue)) + CSSPrimitiveValue::unitTypeToString(m_valueUnitType));

[dgozman, 2015/09/02 22:26:17]

I don't like nullptr as an indicator of inline style.

[sergeyv, 2015/09/03 00:52:28]

Done.

         if (!errorString)
             m_isDirty = true;
     }
 }
 
 void LayoutEditor::overlayEndedPropertyChange()
 {
     m_changingProperty = CSSPropertyInvalid;
     m_propertyInitialValue = 0;
     m_factor = 0;
@@ skipping 13 matching lines @@
     m_matchedRules.clear();
     m_cachedSelectorsInfo.clear();
     m_currentRuleIndex = -1;
 }
 
 void LayoutEditor::initializeCSSRules()
 {
     if (!m_element)
         return;
 
-    Document* ownerDocument = m_element->ownerDocument();
-    // A non-active document has no styles.
-    if (!ownerDocument->isActive())
-        return;
-
-    // Matched rules.
-    StyleResolver& styleResolver = ownerDocument->ensureStyleResolver();
-    PseudoId elementPseudoId = m_element->pseudoId();
-    m_element->updateDistribution();
-    RefPtrWillBeRawPtr<CSSRuleList> matchedRules = styleResolver.pseudoCSSRulesForElement(m_element.get(), elementPseudoId, StyleResolver::AllCSSRules);
+    RefPtrWillBeRawPtr<CSSRuleList> matchedRules = m_cssAgent->matchedRulesList(m_element.get());
     if (!matchedRules)
         return;
 
     HashSet<CSSStyleRule*> uniqRulesSet;
     Vector<CSSStyleRule*> uniqRules;
     for (unsigned i = matchedRules->length(); i > 0; --i) {
         CSSRule* rule = matchedRules->item(i);
         if (!rule || rule->type() != CSSRule::STYLE_RULE || !rule->parentStyleSheet())
             continue;
 
         CSSStyleRule* styleRule = toCSSStyleRule(rule);
 
         if (uniqRulesSet.contains(styleRule))
             continue;
         uniqRulesSet.add(styleRule);
         uniqRules.append(styleRule);
     }
     Vector<std::pair<unsigned, CSSStyleRule*>> selectors;
     for (unsigned i = 0; i < uniqRules.size(); ++i) {
         TrackExceptionState exceptionState;
-        RefPtrWillBeRawPtr<StaticElementList> elements = ownerDocument->querySelectorAll(AtomicString(uniqRules[i]->selectorText()), exceptionState);
+        RefPtrWillBeRawPtr<StaticElementList> elements = m_element->ownerDocument()->querySelectorAll(AtomicString(uniqRules[i]->selectorText()), exceptionState);
         unsigned length = exceptionState.hadException() ? 0: elements->length();
         selectors.append(std::make_pair(length, uniqRules[i]));
     }
 
     std::sort(selectors.begin(), selectors.end(), &comparePairs);
     for (size_t i = 0; i < selectors.size(); ++i)
         m_matchedRules.append(selectors[i].second);
 };
 
 void LayoutEditor::nextSelector()
@@ skipping 103 matching lines @@
                 if (parentRule)
                     break;
                 styleSheet = styleSheet->parentStyleSheet();
             }
         }
     }
     return result.release();
 }
 
 } // namespace blink