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

Unified Diff: Source/core/css/CSSCrossfadeValue.cpp

Issue 1105103003: Update renderer in core/css. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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 | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSDefaultStyleSheets.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSCrossfadeValue.cpp
diff --git a/Source/core/css/CSSCrossfadeValue.cpp b/Source/core/css/CSSCrossfadeValue.cpp
index 179c4b8355a8cc51d6bd1fbc13a60924287085f7..e322487271f213aca64d9cdeb62861cb215dea94 100644
--- a/Source/core/css/CSSCrossfadeValue.cpp
+++ b/Source/core/css/CSSCrossfadeValue.cpp
@@ -47,13 +47,13 @@ static bool subimageIsPending(CSSValue* value)
return false;
}
-static bool subimageKnownToBeOpaque(CSSValue* value, const LayoutObject* renderer)
+static bool subimageKnownToBeOpaque(CSSValue* value, const LayoutObject* layoutObject)
{
if (value->isImageValue())
- return toCSSImageValue(value)->knownToBeOpaque(renderer);
+ return toCSSImageValue(value)->knownToBeOpaque(layoutObject);
if (value->isImageGeneratorValue())
- return toCSSImageGeneratorValue(value)->knownToBeOpaque(renderer);
+ return toCSSImageGeneratorValue(value)->knownToBeOpaque(layoutObject);
ASSERT_NOT_REACHED();
@@ -105,20 +105,20 @@ String CSSCrossfadeValue::customCSSText() const
return result.toString();
}
-IntSize CSSCrossfadeValue::fixedSize(const LayoutObject* renderer)
+IntSize CSSCrossfadeValue::fixedSize(const LayoutObject* layoutObject)
{
float percentage = m_percentageValue->getFloatValue();
float inversePercentage = 1 - percentage;
- Document* document = &renderer->document();
+ Document* document = &layoutObject->document();
ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
if (!cachedFromImage || !cachedToImage)
return IntSize();
- IntSize fromImageSize = cachedFromImage->imageForLayoutObject(renderer)->size();
- IntSize toImageSize = cachedToImage->imageForLayoutObject(renderer)->size();
+ IntSize fromImageSize = cachedFromImage->imageForLayoutObject(layoutObject)->size();
+ IntSize toImageSize = cachedToImage->imageForLayoutObject(layoutObject)->size();
// Rounding issues can cause transitions between images of equal size to return
// a different fixed size; avoid performing the interpolation if the images are the same size.
@@ -134,9 +134,9 @@ bool CSSCrossfadeValue::isPending() const
return subimageIsPending(m_fromValue.get()) || subimageIsPending(m_toValue.get());
}
-bool CSSCrossfadeValue::knownToBeOpaque(const LayoutObject* renderer) const
+bool CSSCrossfadeValue::knownToBeOpaque(const LayoutObject* layoutObject) const
{
- return subimageKnownToBeOpaque(m_fromValue.get(), renderer) && subimageKnownToBeOpaque(m_toValue.get(), renderer);
+ return subimageKnownToBeOpaque(m_fromValue.get(), layoutObject) && subimageKnownToBeOpaque(m_toValue.get(), layoutObject);
}
void CSSCrossfadeValue::loadSubimages(Document* document)
@@ -164,25 +164,25 @@ void CSSCrossfadeValue::loadSubimages(Document* document)
m_crossfadeSubimageObserver.setReady(true);
}
-PassRefPtr<Image> CSSCrossfadeValue::image(LayoutObject* renderer, const IntSize& size)
+PassRefPtr<Image> CSSCrossfadeValue::image(LayoutObject* layoutObject, const IntSize& size)
{
if (size.isEmpty())
return nullptr;
- Document* document = &renderer->document();
+ Document* document = &layoutObject->document();
ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
if (!cachedFromImage || !cachedToImage)
return Image::nullImage();
- Image* fromImage = cachedFromImage->imageForLayoutObject(renderer);
- Image* toImage = cachedToImage->imageForLayoutObject(renderer);
+ Image* fromImage = cachedFromImage->imageForLayoutObject(layoutObject);
+ Image* toImage = cachedToImage->imageForLayoutObject(layoutObject);
if (!fromImage || !toImage)
return Image::nullImage();
- m_generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, m_percentageValue->getFloatValue(), fixedSize(renderer), size);
+ m_generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, m_percentageValue->getFloatValue(), fixedSize(layoutObject), size);
return m_generatedImage.release();
}
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSDefaultStyleSheets.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698