Update renderer in core/css.

Source/core/css/CSSCrossfadeValue.cpp

 /*
  * Copyright (C) 2011 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 29 matching lines @@
         return toCSSImageValue(value)->cachedOrPendingImage()->isPendingImage();
 
     if (value->isImageGeneratorValue())
         return toCSSImageGeneratorValue(value)->isPending();
 
     ASSERT_NOT_REACHED();
 
     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();
 
     return false;
 }
 
 static ImageResource* cachedImageForCSSValue(CSSValue* value, Document* document)
 {
     if (!value)
         return 0;
@@ skipping 31 matching lines @@
     result.appendLiteral("-webkit-cross-fade(");
     result.append(m_fromValue->cssText());
     result.appendLiteral(", ");
     result.append(m_toValue->cssText());
     result.appendLiteral(", ");
     result.append(m_percentageValue->cssText());
     result.append(')');
     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.
     if (fromImageSize == toImageSize)
         return fromImageSize;
 
     return IntSize(fromImageSize.width() * inversePercentage + toImageSize.width() * percentage,
         fromImageSize.height() * inversePercentage + toImageSize.height() * percentage);
 }
 
 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)
 {
     ResourcePtr<ImageResource> oldCachedFromImage = m_cachedFromImage;
     ResourcePtr<ImageResource> oldCachedToImage = m_cachedToImage;
 
     m_cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
     m_cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
 
     if (m_cachedFromImage != oldCachedFromImage) {
         if (oldCachedFromImage)
             oldCachedFromImage->removeClient(&m_crossfadeSubimageObserver);
         if (m_cachedFromImage)
             m_cachedFromImage->addClient(&m_crossfadeSubimageObserver);
     }
 
     if (m_cachedToImage != oldCachedToImage) {
         if (oldCachedToImage)
             oldCachedToImage->removeClient(&m_crossfadeSubimageObserver);
         if (m_cachedToImage)
             m_cachedToImage->addClient(&m_crossfadeSubimageObserver);
     }
 
     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();
 }
 
 void CSSCrossfadeValue::crossfadeChanged(const IntRect&)
 {
     for (const auto& curr : clients()) {
         LayoutObject* client = const_cast<LayoutObject*>(curr.key);
         client->imageChanged(static_cast<WrappedImagePtr>(this));
     }
@@ skipping 23 matching lines @@
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSCrossfadeValue)
 {
     visitor->trace(m_fromValue);
     visitor->trace(m_toValue);
     visitor->trace(m_percentageValue);
     CSSImageGeneratorValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink