third_party/WebKit/Source/core/layout/LayoutImage.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

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/layout/LayoutImage.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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/LayoutBoxModelObject.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutImageResource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutImage.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutImage.cpp b/third_party/WebKit/Source/core/layout/LayoutImage.cpp

index 194897c21693cb888625043369ac0a8770d8ce72..a68042e6f49a67a2fcd78441632eddcc8de28bf5 100644

--- a/third_party/WebKit/Source/core/layout/LayoutImage.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutImage.cpp

@@ -247,7 +247,7 @@ bool LayoutImage::foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect,

return false;

// Check for image with alpha.

TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", "data", InspectorPaintImageEvent::data(this, *m_imageResource->cachedImage()));

- return m_imageResource->cachedImage()->image()->currentFrameKnownToBeOpaque(Image::PreCacheMetadata);

+ return m_imageResource->cachedImage()->getImage()->currentFrameKnownToBeOpaque(Image::PreCacheMetadata);

}

bool LayoutImage::computeBackgroundIsKnownToBeObscured() const

@@ -318,8 +318,8 @@ LayoutBox* LayoutImage::embeddedContentBox() const

return nullptr;

ImageResource* cachedImage = m_imageResource->cachedImage();

- if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage())

- return toSVGImage(cachedImage->image())->embeddedContentBox();

+ if (cachedImage && cachedImage->getImage() && cachedImage->getImage()->isSVGImage())

+ return toSVGImage(cachedImage->getImage())->embeddedContentBox();

return nullptr;

}