Added TODOs to StyleImage::create() to take PassRefPtrWillBeRawPtr

third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 16 matching lines @@
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/style/StyleFetchedImage.h"
 #include "core/style/StyleFetchedImageSet.h"
 #include "core/style/StyleGeneratedImage.h"
 #include "core/style/StyleImage.h"
 #include "core/style/StylePendingImage.h"
 #include "platform/graphics/filters/FilterOperation.h"
 
 namespace blink {
 
+namespace {
+
+PassRefPtrWillBeRawPtr<StylePendingImage> createStylePendingImage(const CSSValue& value)
+{
+    // TODO(sashab): Remove this const_cast and this function once create() can take a PassRefPtrWillBeRawPtr<const CSSValue>.
+    return StylePendingImage::create(const_cast<CSSValue*>(&value));
+}
+
+} // namespace
+
 ElementStyleResources::ElementStyleResources()
     : m_deviceScaleFactor(1)
 {
 }
 
 PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::styleImage(Document& document, CSSPropertyID property, const CSSValue& value)
 {
     if (value.isImageValue())
         return cachedOrPendingFromValue(document, property, toCSSImageValue(value));
 
     if (value.isImageGeneratorValue())
         return generatedOrPendingFromValue(property, toCSSImageGeneratorValue(value));
 
     if (value.isImageSetValue())
         return setOrPendingFromValue(property, toCSSImageSetValue(value));
 
     if (value.isCursorImageValue())
         return cursorOrPendingFromValue(property, toCSSCursorImageValue(value));
 
     return nullptr;
 }
 
 PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::generatedOrPendingFromValue(CSSPropertyID property, const CSSImageGeneratorValue& value)
 {
     if (value.isPending()) {
         m_pendingImageProperties.add(property);
-        return StylePendingImage::create(value);
+        return createStylePendingImage(value);
     }
-    return StyleGeneratedImage::create(value);
+    // TODO(sashab): Remove this const_cast once create() can take a PassRefPtrWillBeRawPtr<const CSSValue>.
+    return StyleGeneratedImage::create(const_cast<CSSImageGeneratorValue*>(&value));
 }
 
 PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(CSSPropertyID property, const CSSImageSetValue& value)
 {
     if (value.isCachePending(m_deviceScaleFactor)) {
         m_pendingImageProperties.add(property);
-        return StylePendingImage::create(value);
+        return createStylePendingImage(value);
     }
     return value.cachedImageSet(m_deviceScaleFactor);
 }
 
 PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cachedOrPendingFromValue(Document& document, CSSPropertyID property, const CSSImageValue& value)
 {
     if (value.isCachePending()) {
         m_pendingImageProperties.add(property);
-        return StylePendingImage::create(value);
+        return createStylePendingImage(value);
     }
     value.restoreCachedResourceIfNeeded(document);
     return value.cachedImage();
 }
 
 PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cursorOrPendingFromValue(CSSPropertyID property, const CSSCursorImageValue& value)
 {
     if (value.isCachePending(m_deviceScaleFactor)) {
         m_pendingImageProperties.add(property);
-        return StylePendingImage::create(value);
+        return createStylePendingImage(value);
     }
     return value.cachedImage(m_deviceScaleFactor);
 }
 
 void ElementStyleResources::clearPendingImageProperties()
 {
     m_pendingImageProperties.clear();
 }
 
 void ElementStyleResources::clearPendingSVGDocuments()
 {
     m_pendingSVGDocuments.clear();
 }
 
 void ElementStyleResources::addPendingSVGDocument(FilterOperation* filterOperation, CSSSVGDocumentValue* cssSVGDocumentValue)
 {
     m_pendingSVGDocuments.set(filterOperation, cssSVGDocumentValue);
 }
 
 }