third_party/WebKit/Source/core/html/HTMLImageElement.cpp - 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/HTMLImageElement.cpp

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/HTMLImageElement.h ('k') | third_party/WebKit/Source/core/html/HTMLImageElementTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLImageElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp

index ae623aa5b06f2528997fc5596fae464094d7f11b..3c8690be6df88c30ecaba6d0d940a0c1e1731922 100644

--- a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp

@@ -252,7 +252,7 @@ void HTMLImageElement::setBestFitURLAndDPRFromImageCandidate(const ImageCandidat

m_imageDevicePixelRatio = 1.0 / candidateDensity;

bool intrinsicSizingViewportDependant = false;

- if (candidate.resourceWidth() > 0) {

+ if (candidate.getResourceWidth() > 0) {

intrinsicSizingViewportDependant = true;

UseCounter::count(document(), UseCounter::SrcsetWDescriptor);

} else if (!candidate.srcOrigin()) {

@@ -671,7 +671,7 @@ static bool sourceSizeValue(Element& element, Document& currentDocument, float&

return exists;

}

-FetchRequest::ResourceWidth HTMLImageElement::resourceWidth()

+FetchRequest::ResourceWidth HTMLImageElement::getResourceWidth()

{

FetchRequest::ResourceWidth resourceWidth;

Element* element = m_source.get();