third_party/WebKit/Source/platform/graphics/BitmapImage.cpp - Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size

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/platform/graphics/BitmapImage.cpp

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/platform/graphics/BitmapImage.h ('k') | third_party/WebKit/Source/platform/graphics/CrossfadeGeneratedImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

index 34894c618c6e4145098d1d147276a711d2053728..1f7eb4f82d0413849fbd615a843b0828e4c79033 100644

--- a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

+++ b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

@@ -190,7 +190,7 @@ void BitmapImage::updateSize() const

m_haveSize = true;

}

-IntSize BitmapImage::size() const

+IntSize BitmapImage::concreteObjectSize(const FloatSize&) const

{

updateSize();

return m_size;

@@ -330,7 +330,7 @@ bool BitmapImage::isSizeAvailable()

m_sizeAvailable = m_source.isSizeAvailable();

- if (m_sizeAvailable && hasVisibleImageSize(size())) {

+ if (m_sizeAvailable && hasVisibleImageSize(defaultConcreteObjectSize())) {

BitmapImageMetrics::countDecodedImageType(m_source.filenameExtension());

if (m_source.filenameExtension() == "jpg")

BitmapImageMetrics::countImageOrientation(m_source.orientationAtIndex(0).orientation());