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

Unified Diff: Source/core/style/StylePendingImage.h

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 5 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/style/StyleImage.h ('k') | Source/modules/canvas2d/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/style/StylePendingImage.h
diff --git a/Source/core/style/StylePendingImage.h b/Source/core/style/StylePendingImage.h
index 8a5153abb987fc0b08af51b1f59e03d1fa435156..a80cfc34c2a8d74db1e2fe13188c7c18ba907059 100644
--- a/Source/core/style/StylePendingImage.h
+++ b/Source/core/style/StylePendingImage.h
@@ -41,11 +41,11 @@ namespace blink {
class StylePendingImage final : public StyleImage {
public:
- static PassRefPtr<StylePendingImage> create(CSSValue* value) { return adoptRef(new StylePendingImage(value)); }
+ static PassRefPtr<StylePendingImage> create(CSSValueObject* value) { return adoptRef(new StylePendingImage(value)); }
virtual WrappedImagePtr data() const override { return m_value; }
- virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override { return m_value; }
+ virtual NullableCSSValue cssValue() const override { return m_value; }
CSSImageValue* cssImageValue() const { return m_value->isImageValue() ? toCSSImageValue(m_value) : 0; }
CSSImageGeneratorValue* cssImageGeneratorValue() const { return m_value->isImageGeneratorValue() ? toCSSImageGeneratorValue(m_value) : 0; }
CSSCursorImageValue* cssCursorImageValue() const { return m_value->isCursorImageValue() ? toCSSCursorImageValue(m_value) : 0; }
@@ -67,13 +67,13 @@ public:
virtual bool knownToBeOpaque(const LayoutObject*) const override { return false; }
private:
- StylePendingImage(CSSValue* value)
+ StylePendingImage(CSSValueObject* value)
: m_value(value)
{
m_isPendingImage = true;
}
- CSSValue* m_value; // Not retained; it owns us.
+ CSSValueObject* m_value; // Not retained; it owns us.
};
DEFINE_STYLE_IMAGE_TYPE_CASTS(StylePendingImage, isPendingImage());
« no previous file with comments | « Source/core/style/StyleImage.h ('k') | Source/modules/canvas2d/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698