Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp

Issue 1704493002: Use Image::updateConcreteSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-image-updateconcretesize
Patch Set: Move test here from dependency CL. 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
OLDNEW
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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 LayoutSize scaledImageSize = m_bestFitImage->imageSize(LayoutObject::shouldR espectImageOrientation(layoutObject), multiplier); 98 LayoutSize scaledImageSize = m_bestFitImage->imageSize(LayoutObject::shouldR espectImageOrientation(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::updateConcreteObjectSize(const LayoutSize& defaultObj ectSize)
109 {
110 m_bestFitImage->updateConcreteObjectSize(defaultObjectSize);
111 }
112
108 void StyleFetchedImageSet::computeIntrinsicDimensions(const LayoutObject*, Float Size& intrinsicSize, FloatSize& intrinsicRatio) 113 void StyleFetchedImageSet::computeIntrinsicDimensions(const LayoutObject*, Float Size& intrinsicSize, FloatSize& intrinsicRatio)
109 { 114 {
110 m_bestFitImage->computeIntrinsicDimensions(intrinsicSize, intrinsicRatio); 115 m_bestFitImage->computeIntrinsicDimensions(intrinsicSize, intrinsicRatio);
111 } 116 }
112 117
113 bool StyleFetchedImageSet::usesImageContainerSize() const 118 bool StyleFetchedImageSet::usesImageContainerSize() const
114 { 119 {
115 return m_bestFitImage->usesImageContainerSize(); 120 return m_bestFitImage->usesImageContainerSize();
116 } 121 }
117 122
(...skipping 22 matching lines...) Expand all
140 } 145 }
141 146
142 DEFINE_TRACE(StyleFetchedImageSet) 147 DEFINE_TRACE(StyleFetchedImageSet)
143 { 148 {
144 visitor->trace(m_bestFitImage); 149 visitor->trace(m_bestFitImage);
145 visitor->trace(m_imageSetValue); 150 visitor->trace(m_imageSetValue);
146 StyleImage::trace(visitor); 151 StyleImage::trace(visitor);
147 } 152 }
148 153
149 } // namespace blink 154 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698