third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.h - Issue 1738623004: Rename enums/functions that collide in chromium style.

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/parser/HTMLSrcsetParser.h

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

Patch Set: get-names-5: rebase-and-stuff 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/parser/HTMLPreloadScannerTest.cpp ('k') | third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.h

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

index e12447f7a5fc8b2faf574eae871883d85e637e4a..16492ee1c58b5f9af60161b893e3b278a74e4150 100644

--- a/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.h

+++ b/third_party/WebKit/Source/core/html/parser/HTMLSrcsetParser.h

@@ -57,7 +57,7 @@ public:

bool hasHeight() const { return m_resourceHeight >= 0; }

float density() const { ASSERT(hasDensity()); return m_density; }

- unsigned resourceWidth() const { ASSERT(hasWidth()); return m_resourceWidth; }

+ unsigned getResourceWidth() const { ASSERT(hasWidth()); return m_resourceWidth; }

unsigned resourceHeight() const { ASSERT(hasHeight()); return m_resourceHeight; }

void setResourceWidth(int width) { ASSERT(width >= 0); m_resourceWidth = (unsigned)width; }

@@ -88,7 +88,7 @@ public:

ImageCandidate(const String& source, unsigned start, unsigned length, const DescriptorParsingResult& result, OriginAttribute originAttribute)

: m_string(source.createView(start, length))

, m_density(result.hasDensity()?result.density():UninitializedDescriptor)

- , m_resourceWidth(result.hasWidth()?result.resourceWidth():UninitializedDescriptor)

+ , m_resourceWidth(result.hasWidth()?result.getResourceWidth():UninitializedDescriptor)

, m_originAttribute(originAttribute)

{

}

@@ -113,7 +113,7 @@ public:

return m_density;

}

- int resourceWidth() const

+ int getResourceWidth() const

{

return m_resourceWidth;

}