| Index: third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp b/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
|
| index 25cd232ff0fe645c55dda46cc7dc5bc1a4437433..b20c8428fa9fcb0996fc6a3fc312b87d9c98c52d 100644
|
| --- a/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
|
| +++ b/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
|
| @@ -257,6 +257,8 @@ CSSRule* ElementRuleCollector::findStyleRule(CSSRuleCollection* cssRules,
|
| return nullptr;
|
| CSSRule* result = 0;
|
| for (unsigned i = 0; i < cssRules->length() && !result; ++i) {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |item| below. */
|
| CSSRule* cssRule = cssRules->item(i);
|
| CSSRule::Type cssRuleType = cssRule->type();
|
| if (cssRuleType == CSSRule::kStyleRule) {
|
|
|