third_party/WebKit/Source/core/html/HTMLLinkElement.h - Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/.

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/html/HTMLLinkElement.h

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5

Patch Set: get-names-6: . Created 4 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

« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLDialogElement.h ('k') | third_party/WebKit/Source/core/html/HTMLLinkElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLLinkElement.h

diff --git a/third_party/WebKit/Source/core/html/HTMLLinkElement.h b/third_party/WebKit/Source/core/html/HTMLLinkElement.h

index d42bf5045ff1e1c8e4534c5b957d73c914769720..cb89768adfa0613340d1067007eca892f9886b1a 100644

--- a/third_party/WebKit/Source/core/html/HTMLLinkElement.h

+++ b/third_party/WebKit/Source/core/html/HTMLLinkElement.h

@@ -65,7 +65,7 @@ public:

explicit LinkStyle(HTMLLinkElement* owner);

~LinkStyle() override;

- Type type() const override { return Style; }

+ LinkResourceType type() const override { return Style; }

void process() override;

void ownerRemoved() override;

bool hasLoaded() const override { return m_loadedSheet; }

@@ -146,7 +146,7 @@ public:

const AtomicString& type() const;

- IconType iconType() const;

+ IconType getIconType() const;

// the icon sizes as parsed from the HTML attribute

const Vector<IntSize>& iconSizes() const;

« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLDialogElement.h ('k') | third_party/WebKit/Source/core/html/HTMLLinkElement.cpp » ('j') | no next file with comments »