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

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

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: Rebasing the fixes... Created 3 years, 10 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/InspectorCSSAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
index 78d51278aab804ddac2024f09e543a3a668923fe..31daecdafdfc1b02c702963221d17c582ba1353d 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp
@@ -987,6 +987,8 @@ static CSSKeyframesRule* findKeyframesRule(CSSRuleCollection* cssRules,
StyleRuleKeyframes* keyframesRule) {
CSSKeyframesRule* result = 0;
for (unsigned j = 0; cssRules && j < cssRules->length() && !result; ++j) {
+ /* DO NOT SUBMIT - merge conflict marker.
+ * Please spell |item| below. */
CSSRule* cssRule = cssRules->item(j);
if (cssRule->type() == CSSRule::kKeyframesRule) {
CSSKeyframesRule* cssStyleRule = toCSSKeyframesRule(cssRule);

Powered by Google App Engine
This is Rietveld 408576698