Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(467)

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp

Issue 2068053002: Rename Blink constants generated from IDL files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unintended exception message change Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
index 1fdc7f4497f84385b14bb552c52501f4bfd5316f..8eb0a4a922475607562747bf2fce671f6871db6f 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp
@@ -489,13 +489,13 @@ CSSRuleList* asCSSRuleList(CSSRule* rule)
if (!rule)
return nullptr;
- if (rule->type() == CSSRule::MEDIA_RULE)
+ if (rule->type() == CSSRule::kMediaRule)
return toCSSMediaRule(rule)->cssRules();
- if (rule->type() == CSSRule::SUPPORTS_RULE)
+ if (rule->type() == CSSRule::kSupportsRule)
return toCSSSupportsRule(rule)->cssRules();
- if (rule->type() == CSSRule::KEYFRAMES_RULE)
+ if (rule->type() == CSSRule::kKeyframesRule)
return toCSSKeyframesRule(rule)->cssRules();
return nullptr;
@@ -512,18 +512,18 @@ void collectFlatRules(RuleList ruleList, CSSRuleVector* result)
// The result->append()'ed types should be exactly the same as in flattenSourceData().
switch (rule->type()) {
- case CSSRule::STYLE_RULE:
- case CSSRule::IMPORT_RULE:
- case CSSRule::CHARSET_RULE:
- case CSSRule::PAGE_RULE:
- case CSSRule::FONT_FACE_RULE:
- case CSSRule::VIEWPORT_RULE:
- case CSSRule::KEYFRAME_RULE:
+ case CSSRule::kStyleRule:
+ case CSSRule::kImportRule:
+ case CSSRule::kCharsetRule:
+ case CSSRule::kPageRule:
+ case CSSRule::kFontFaceRule:
+ case CSSRule::kViewportRule:
+ case CSSRule::kKeyframeRule:
result->append(rule);
break;
- case CSSRule::MEDIA_RULE:
- case CSSRule::SUPPORTS_RULE:
- case CSSRule::KEYFRAMES_RULE:
+ case CSSRule::kMediaRule:
+ case CSSRule::kSupportsRule:
+ case CSSRule::kKeyframesRule:
result->append(rule);
collectFlatRules(asCSSRuleList(rule), result);
break;
@@ -633,7 +633,7 @@ void diff(const Vector<String>& listA, const Vector<String>& listB, IndexMap* aT
String canonicalCSSText(CSSRule* rule)
{
- if (rule->type() != CSSRule::STYLE_RULE)
+ if (rule->type() != CSSRule::kStyleRule)
return rule->cssText();
CSSStyleRule* styleRule = toCSSStyleRule(rule);
@@ -999,7 +999,7 @@ CSSStyleRule* InspectorStyleSheet::setRuleSelector(const SourceRange& range, con
}
CSSRule* rule = ruleForSourceData(sourceData);
- if (!rule || !rule->parentStyleSheet() || rule->type() != CSSRule::STYLE_RULE) {
+ if (!rule || !rule->parentStyleSheet() || rule->type() != CSSRule::kStyleRule) {
exceptionState.throwDOMException(NotFoundError, "Source range didn't match existing style source range");
return nullptr;
}
@@ -1027,7 +1027,7 @@ CSSKeyframeRule* InspectorStyleSheet::setKeyframeKey(const SourceRange& range, c
}
CSSRule* rule = ruleForSourceData(sourceData);
- if (!rule || !rule->parentStyleSheet() || rule->type() != CSSRule::KEYFRAME_RULE) {
+ if (!rule || !rule->parentStyleSheet() || rule->type() != CSSRule::kKeyframeRule) {
exceptionState.throwDOMException(NotFoundError, "Source range didn't match existing style source range");
return nullptr;
}
@@ -1055,15 +1055,15 @@ CSSRule* InspectorStyleSheet::setStyleText(const SourceRange& range, const Strin
}
CSSRule* rule = ruleForSourceData(sourceData);
- if (!rule || !rule->parentStyleSheet() || (rule->type() != CSSRule::STYLE_RULE && rule->type() != CSSRule::KEYFRAME_RULE)) {
+ if (!rule || !rule->parentStyleSheet() || (rule->type() != CSSRule::kStyleRule && rule->type() != CSSRule::kKeyframeRule)) {
exceptionState.throwDOMException(NotFoundError, "Source range didn't match existing style source range");
return nullptr;
}
CSSStyleDeclaration* style = nullptr;
- if (rule->type() == CSSRule::STYLE_RULE)
+ if (rule->type() == CSSRule::kStyleRule)
style = toCSSStyleRule(rule)->style();
- else if (rule->type() == CSSRule::KEYFRAME_RULE)
+ else if (rule->type() == CSSRule::kKeyframeRule)
style = toCSSKeyframeRule(rule)->style();
style->setCSSText(text, exceptionState);
@@ -1087,7 +1087,7 @@ CSSMediaRule* InspectorStyleSheet::setMediaRuleText(const SourceRange& range, co
}
CSSRule* rule = ruleForSourceData(sourceData);
- if (!rule || !rule->parentStyleSheet() || rule->type() != CSSRule::MEDIA_RULE) {
+ if (!rule || !rule->parentStyleSheet() || rule->type() != CSSRule::kMediaRule) {
exceptionState.throwDOMException(NotFoundError, "Source range didn't match existing style source range");
return nullptr;
}
@@ -1177,7 +1177,7 @@ CSSStyleRule* InspectorStyleSheet::insertCSSOMRuleBySourceRange(const SourceRang
return insertCSSOMRuleInStyleSheet(insertBeforeRule, ruleText, exceptionState);
CSSRule* rule = ruleForSourceData(containingRuleSourceData);
- if (!rule || rule->type() != CSSRule::MEDIA_RULE) {
+ if (!rule || rule->type() != CSSRule::kMediaRule) {
exceptionState.throwDOMException(NotFoundError, "Cannot insert rule in non-media rule.");
return nullptr;
}
@@ -1247,7 +1247,7 @@ bool InspectorStyleSheet::deleteRule(const SourceRange& range, ExceptionState& e
}
CSSRule* parentRule = rule->parentRule();
if (parentRule) {
- if (parentRule->type() != CSSRule::MEDIA_RULE) {
+ if (parentRule->type() != CSSRule::kMediaRule) {
exceptionState.throwDOMException(NotFoundError, "Cannot remove rule from non-media rule.");
return false;
}

Powered by Google App Engine
This is Rietveld 408576698