| Index: third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
|
| index b12c36c3da2345b1e26264d5c9ce1c3bd7834298..62240aa3e10a5ecf1eddebceb7c98c873c2086ed 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
|
| @@ -118,7 +118,7 @@ HeapVector<Member<CSSStyleRule>> filterDuplicateRules(CSSRuleList* ruleList)
|
| HeapHashSet<Member<CSSRule>> uniqRulesSet;
|
| for (unsigned i = ruleList ? ruleList->length() : 0; i > 0; --i) {
|
| CSSRule* rule = ruleList->item(i - 1);
|
| - if (!rule || rule->type() != CSSRule::STYLE_RULE || uniqRulesSet.contains(rule))
|
| + if (!rule || rule->type() != CSSRule::kStyleRule || uniqRulesSet.contains(rule))
|
| continue;
|
| uniqRulesSet.add(rule);
|
| uniqRules.append(toCSSStyleRule(rule));
|
| @@ -441,9 +441,9 @@ public:
|
| if (m_type != SetStyleText)
|
| return nullptr;
|
| CSSRule* rule = takeRule();
|
| - if (rule->type() == CSSRule::STYLE_RULE)
|
| + if (rule->type() == CSSRule::kStyleRule)
|
| return m_styleSheet->buildObjectForStyle(toCSSStyleRule(rule)->style());
|
| - if (rule->type() == CSSRule::KEYFRAME_RULE)
|
| + if (rule->type() == CSSRule::kKeyframeRule)
|
| return m_styleSheet->buildObjectForStyle(toCSSKeyframeRule(rule)->style());
|
| return nullptr;
|
| }
|
| @@ -596,7 +596,7 @@ private:
|
| // static
|
| CSSStyleRule* InspectorCSSAgent::asCSSStyleRule(CSSRule* rule)
|
| {
|
| - if (!rule || rule->type() != CSSRule::STYLE_RULE)
|
| + if (!rule || rule->type() != CSSRule::kStyleRule)
|
| return nullptr;
|
| return toCSSStyleRule(rule);
|
| }
|
| @@ -604,7 +604,7 @@ CSSStyleRule* InspectorCSSAgent::asCSSStyleRule(CSSRule* rule)
|
| // static
|
| CSSMediaRule* InspectorCSSAgent::asCSSMediaRule(CSSRule* rule)
|
| {
|
| - if (!rule || rule->type() != CSSRule::MEDIA_RULE)
|
| + if (!rule || rule->type() != CSSRule::kMediaRule)
|
| return nullptr;
|
| return toCSSMediaRule(rule);
|
| }
|
| @@ -823,7 +823,7 @@ void InspectorCSSAgent::getMediaQueries(ErrorString* errorString, std::unique_pt
|
| const CSSRuleVector& flatRules = styleSheet->flatRules();
|
| for (unsigned i = 0; i < flatRules.size(); ++i) {
|
| CSSRule* rule = flatRules.at(i).get();
|
| - if (rule->type() == CSSRule::MEDIA_RULE || rule->type() == CSSRule::IMPORT_RULE)
|
| + if (rule->type() == CSSRule::kMediaRule || rule->type() == CSSRule::kImportRule)
|
| collectMediaQueriesFromRule(rule, medias->get());
|
| }
|
| }
|
| @@ -913,11 +913,11 @@ static CSSKeyframesRule* findKeyframesRule(CSSRuleCollection* cssRules, StyleRul
|
| CSSKeyframesRule* result = 0;
|
| for (unsigned j = 0; cssRules && j < cssRules->length() && !result; ++j) {
|
| CSSRule* cssRule = cssRules->item(j);
|
| - if (cssRule->type() == CSSRule::KEYFRAMES_RULE) {
|
| + if (cssRule->type() == CSSRule::kKeyframesRule) {
|
| CSSKeyframesRule* cssStyleRule = toCSSKeyframesRule(cssRule);
|
| if (cssStyleRule->keyframes() == keyframesRule)
|
| result = cssStyleRule;
|
| - } else if (cssRule->type() == CSSRule::IMPORT_RULE) {
|
| + } else if (cssRule->type() == CSSRule::kImportRule) {
|
| CSSImportRule* cssImportRule = toCSSImportRule(cssRule);
|
| result = findKeyframesRule(cssImportRule->styleSheet(), keyframesRule);
|
| } else {
|
| @@ -1265,9 +1265,9 @@ CSSStyleDeclaration* InspectorCSSAgent::setStyleText(ErrorString* errorString, I
|
| bool success = m_domAgent->history()->perform(action, exceptionState);
|
| if (success) {
|
| CSSRule* rule = action->takeRule();
|
| - if (rule->type() == CSSRule::STYLE_RULE)
|
| + if (rule->type() == CSSRule::kStyleRule)
|
| return toCSSStyleRule(rule)->style();
|
| - if (rule->type() == CSSRule::KEYFRAME_RULE)
|
| + if (rule->type() == CSSRule::kKeyframeRule)
|
| return toCSSKeyframeRule(rule)->style();
|
| }
|
| }
|
| @@ -1477,11 +1477,11 @@ void InspectorCSSAgent::collectMediaQueriesFromRule(CSSRule* rule, protocol::Arr
|
| String sourceURL;
|
| CSSStyleSheet* parentStyleSheet = nullptr;
|
| bool isMediaRule = true;
|
| - if (rule->type() == CSSRule::MEDIA_RULE) {
|
| + if (rule->type() == CSSRule::kMediaRule) {
|
| CSSMediaRule* mediaRule = toCSSMediaRule(rule);
|
| mediaList = mediaRule->media();
|
| parentStyleSheet = mediaRule->parentStyleSheet();
|
| - } else if (rule->type() == CSSRule::IMPORT_RULE) {
|
| + } else if (rule->type() == CSSRule::kImportRule) {
|
| CSSImportRule* importRule = toCSSImportRule(rule);
|
| mediaList = importRule->media();
|
| parentStyleSheet = importRule->parentStyleSheet();
|
| @@ -1572,7 +1572,7 @@ void InspectorCSSAgent::collectStyleSheets(CSSStyleSheet* styleSheet, HeapVector
|
| result.append(styleSheet);
|
| for (unsigned i = 0, size = styleSheet->length(); i < size; ++i) {
|
| CSSRule* rule = styleSheet->item(i);
|
| - if (rule->type() == CSSRule::IMPORT_RULE) {
|
| + if (rule->type() == CSSRule::kImportRule) {
|
| CSSStyleSheet* importedStyleSheet = toCSSImportRule(rule)->styleSheet();
|
| if (importedStyleSheet)
|
| InspectorCSSAgent::collectStyleSheets(importedStyleSheet, result);
|
|
|