third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp - Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size

Side by Side Diff: third_party/WebKit/Source/core/style/StyleFetchedImageSet.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 unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Apple Inc. All rights reserved.	2 * Copyright (C) 2012 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 bool StyleFetchedImageSet::isLoaded() const	86 bool StyleFetchedImageSet::isLoaded() const

87 {	87 {

88 return m_bestFitImage->isLoaded();	88 return m_bestFitImage->isLoaded();

89 }	89 }

90	90

91 bool StyleFetchedImageSet::errorOccurred() const	91 bool StyleFetchedImageSet::errorOccurred() const

92 {	92 {

93 return m_bestFitImage->errorOccurred();	93 return m_bestFitImage->errorOccurred();

94 }	94 }

95	95

96 LayoutSize StyleFetchedImageSet::imageSize(const LayoutObject* layoutObject, flo at multiplier) const	96 LayoutSize StyleFetchedImageSet::concreteObjectSize(const LayoutObject* layoutOb ject, const FloatSize& defaultObjectSize, float multiplier) const

97 {	97 {

98 LayoutSize scaledImageSize = m_bestFitImage->imageSize(LayoutObject::shouldR espectImageOrientation(layoutObject), multiplier);	98 LayoutSize scaledImageSize = m_bestFitImage->concreteObjectSize(defaultObjec tSize, LayoutObject::shouldRespectImageOrientation(layoutObject), multiplier);

99 scaledImageSize.scale(1 / m_imageScaleFactor);	99 scaledImageSize.scale(1 / m_imageScaleFactor);

100 return scaledImageSize;	100 return scaledImageSize;

101 }	101 }

102	102

103 bool StyleFetchedImageSet::imageHasRelativeSize() const	103 bool StyleFetchedImageSet::imageHasRelativeSize() const

104 {	104 {

105 return m_bestFitImage->imageHasRelativeSize();	105 return m_bestFitImage->imageHasRelativeSize();

106 }	106 }

107	107

108 void StyleFetchedImageSet::computeIntrinsicDimensions(const LayoutObject*, Float Size& intrinsicSize, FloatSize& intrinsicRatio)	108 void StyleFetchedImageSet::computeIntrinsicDimensions(const LayoutObject*, Float Size& intrinsicSize, FloatSize& intrinsicRatio)

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
140 }	140 }

141	141

142 DEFINE_TRACE(StyleFetchedImageSet)	142 DEFINE_TRACE(StyleFetchedImageSet)

143 {	143 {

144 visitor->trace(m_bestFitImage);	144 visitor->trace(m_bestFitImage);

145 visitor->trace(m_imageSetValue);	145 visitor->trace(m_imageSetValue);

146 StyleImage::trace(visitor);	146 StyleImage::trace(visitor);

147 }	147 }

148	148

149 } // namespace blink	149 } // namespace blink

OLD	NEW