third_party/WebKit/Source/core/loader/resource/XSLStyleSheetResource.h - Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

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/XSLStyleSheetResource.h

Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions). (Closed)

Patch Set: Inducing merge conflicts to force human review and changes after rename. Created 3 years, 11 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/loader/resource/ScriptResource.h ('k') | third_party/WebKit/Source/core/style/BasicShapes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7e597e6a42039aa8f9e50edf63e509c0ac9426d8..b2a3d7821fca5cca9e87dc2d4c9697da53fe9f62 100644

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

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

@@ -64,6 +64,8 @@ class XSLStyleSheetResource final : public StyleSheetResource {

};

DEFINE_RESOURCE_TYPE_CASTS(XSLStyleSheet);

+/* DO NOT SUBMIT - Conflict resolution helper:

+ * Above we should have XSLStyleSheet, not kXSLStyleSheet */

} // namespace blink