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.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: More fixes - things build fine at this point. Created 3 years, 8 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:

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 605c0079c59e6baa6c9ca0eb609dd183be64d1f6..edf213cf7976ab37ae63b565e52fd387e45a12e9 100644

--- a/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp

+++ b/third_party/WebKit/Source/core/inspector/InspectorCSSAgent.cpp

@@ -997,6 +997,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);