third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.h - 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/loader/resource/CSSStyleSheetResource.h

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/layout/line/InlineBox.h ('k') | third_party/WebKit/Source/core/loader/resource/FontResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.h

diff --git a/third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.h b/third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.h

index 38ac0488f5cc0af2646a449cd310a3adc6926a8f..6f8117b20e5bb0527b9fc2c8ddf44fcd8ca0b197 100644

--- a/third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.h

+++ b/third_party/WebKit/Source/core/loader/resource/CSSStyleSheetResource.h

@@ -93,6 +93,8 @@ class CORE_EXPORT CSSStyleSheetResource final : public StyleSheetResource {

};

DEFINE_RESOURCE_TYPE_CASTS(CSSStyleSheet);

+/* DO NOT SUBMIT - Conflict resolution helper:

+ * Above we should have CSSStyleSheet, not kCSSStyleSheet */

} // namespace blink