CSSValue Immediates: Change CSSValue to an object instead of a pointer

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 16 matching lines @@
 #include "core/css/CSSCrossfadeValue.h"
 
 #include "core/css/CSSImageValue.h"
 #include "core/layout/LayoutObject.h"
 #include "core/style/StyleFetchedImage.h"
 #include "platform/graphics/CrossfadeGeneratedImage.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
-static bool subimageIsPending(CSSValue* value)
+static bool subimageIsPending(CSSValue value)
 {
-    if (value->isImageValue())
-        return toCSSImageValue(value)->cachedOrPendingImage()->isPendingImage();
+    if (value.isImageValue())
+        return toCSSImageValue(value).cachedOrPendingImage()->isPendingImage();
 
-    if (value->isImageGeneratorValue())
-        return toCSSImageGeneratorValue(value)->isPending();
+    if (value.isImageGeneratorValue())
+        return toCSSImageGeneratorValue(value).isPending();
 
     ASSERT_NOT_REACHED();
 
     return false;
 }
 
-static bool subimageKnownToBeOpaque(CSSValue* value, const LayoutObject* layoutObject)
+static bool subimageKnownToBeOpaque(CSSValue value, const LayoutObject* layoutObject)
 {
-    if (value->isImageValue())
-        return toCSSImageValue(value)->knownToBeOpaque(layoutObject);
+    if (value.isImageValue())
+        return toCSSImageValue(value).knownToBeOpaque(layoutObject);
 
-    if (value->isImageGeneratorValue())
-        return toCSSImageGeneratorValue(value)->knownToBeOpaque(layoutObject);
+    if (value.isImageGeneratorValue())
+        return toCSSImageGeneratorValue(value).knownToBeOpaque(layoutObject);
 
     ASSERT_NOT_REACHED();
 
     return false;
 }
 
-static ImageResource* cachedImageForCSSValue(CSSValue* value, Document* document)
+static ImageResource* cachedImageForCSSValue(CSSValue value, Document* document)
 {
-    if (!value)
-        return 0;
-
-    if (value->isImageValue()) {
-        StyleFetchedImage* styleImageResource = toCSSImageValue(value)->cachedImage(document);
+    if (value.isImageValue()) {
+        StyleFetchedImage* styleImageResource = toCSSImageValue(value).cachedImage(document);
         if (!styleImageResource)
             return 0;
 
         return styleImageResource->cachedImage();
     }
 
-    if (value->isImageGeneratorValue()) {
-        toCSSImageGeneratorValue(value)->loadSubimages(document);
+    if (value.isImageGeneratorValue()) {
+        toCSSImageGeneratorValue(value).loadSubimages(document);
         // FIXME: Handle CSSImageGeneratorValue (and thus cross-fades with gradients and canvas).
         return 0;
     }
 
     ASSERT_NOT_REACHED();
 
     return 0;
 }
 
 CSSCrossfadeValue::~CSSCrossfadeValue()
 {
     if (m_cachedFromImage)
         m_cachedFromImage->removeClient(&m_crossfadeSubimageObserver);
     if (m_cachedToImage)
         m_cachedToImage->removeClient(&m_crossfadeSubimageObserver);
 }
 
 String CSSCrossfadeValue::customCSSText() const
 {
     StringBuilder result;
     result.appendLiteral("-webkit-cross-fade(");
-    result.append(m_fromValue->cssText());
+    result.append(m_fromValue.cssText());
     result.appendLiteral(", ");
-    result.append(m_toValue->cssText());
+    result.append(m_toValue.cssText());
     result.appendLiteral(", ");
     result.append(m_percentageValue->cssText());
     result.append(')');
     return result.toString();
 }
 
 IntSize CSSCrossfadeValue::fixedSize(const LayoutObject* layoutObject)
 {
     float percentage = m_percentageValue->getFloatValue();
     float inversePercentage = 1 - percentage;
 
     Document* document = &layoutObject->document();
-    ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
-    ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
+    ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue, document);
+    ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue, document);
 
     if (!cachedFromImage || !cachedToImage)
         return IntSize();
 
     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());
+    return subimageIsPending(m_fromValue) || subimageIsPending(m_toValue);
 }
 
 bool CSSCrossfadeValue::knownToBeOpaque(const LayoutObject* layoutObject) const
 {
-    return subimageKnownToBeOpaque(m_fromValue.get(), layoutObject) && subimageKnownToBeOpaque(m_toValue.get(), layoutObject);
+    return subimageKnownToBeOpaque(m_fromValue, layoutObject) && subimageKnownToBeOpaque(m_toValue, 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);
+    m_cachedFromImage = cachedImageForCSSValue(m_fromValue, document);
+    m_cachedToImage = cachedImageForCSSValue(m_toValue, 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* layoutObject, const IntSize& size)
 {
     if (size.isEmpty())
         return nullptr;
 
     Document* document = &layoutObject->document();
-    ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
-    ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
+    ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue, document);
+    ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue, document);
 
     if (!cachedFromImage || !cachedToImage)
         return Image::nullImage();
 
     Image* fromImage = cachedFromImage->imageForLayoutObject(layoutObject);
     Image* toImage = cachedToImage->imageForLayoutObject(layoutObject);
 
     if (!fromImage || !toImage)
         return Image::nullImage();
 
@@ skipping 20 matching lines @@
 {
     if (m_cachedFromImage && m_cachedFromImage->loadFailedOrCanceled())
         return true;
     if (m_cachedToImage && m_cachedToImage->loadFailedOrCanceled())
         return true;
     return false;
 }
 
 bool CSSCrossfadeValue::equals(const CSSCrossfadeValue& other) const
 {
-    return compareCSSValuePtr(m_fromValue, other.m_fromValue)
-        && compareCSSValuePtr(m_toValue, other.m_toValue)
+    return m_fromValue.equals(other.m_fromValue)
+        && m_toValue.equals(other.m_toValue)
         && compareCSSValuePtr(m_percentageValue, other.m_percentageValue);
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSCrossfadeValue)
 {
     visitor->trace(m_fromValue);
     visitor->trace(m_toValue);
     visitor->trace(m_percentageValue);
     CSSImageGeneratorValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink