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

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

Issue 1369213002: Revert of Replace RawPtr with RefPtr on StylePendingImage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « third_party/WebKit/Source/core/page/PageSerializer.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/StylePendingImage.h
diff --git a/third_party/WebKit/Source/core/style/StylePendingImage.h b/third_party/WebKit/Source/core/style/StylePendingImage.h
index 7d48c81ab88a3c2307142787a51480b874a6af10..79e58947cafadebd9a441aaed9c1fd736c1df72b 100644
--- a/third_party/WebKit/Source/core/style/StylePendingImage.h
+++ b/third_party/WebKit/Source/core/style/StylePendingImage.h
@@ -46,7 +46,7 @@
return adoptRefWillBeNoop(new StylePendingImage(value));
}
- WrappedImagePtr data() const override { return m_value.get(); }
+ WrappedImagePtr data() const override { return m_value; }
PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override { return m_value; }
@@ -56,10 +56,10 @@
return nullptr;
}
- CSSImageValue* cssImageValue() const { return m_value->isImageValue() ? toCSSImageValue(m_value.get()) : 0; }
- CSSImageGeneratorValue* cssImageGeneratorValue() const { return m_value->isImageGeneratorValue() ? toCSSImageGeneratorValue(m_value.get()) : 0; }
- CSSCursorImageValue* cssCursorImageValue() const { return m_value->isCursorImageValue() ? toCSSCursorImageValue(m_value.get()) : 0; }
- CSSImageSetValue* cssImageSetValue() const { return m_value->isImageSetValue() ? toCSSImageSetValue(m_value.get()) : 0; }
+ 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; }
+ CSSImageSetValue* cssImageSetValue() const { return m_value->isImageSetValue() ? toCSSImageSetValue(m_value) : 0; }
LayoutSize imageSize(const LayoutObject*, float /*multiplier*/) const override { return LayoutSize(); }
bool imageHasRelativeWidth() const override { return false; }
@@ -89,7 +89,7 @@
m_isPendingImage = true;
}
- RefPtrWillBeMember<CSSValue> m_value;
+ RawPtrWillBeMember<CSSValue> m_value; // Not retained; it owns us.
};
DEFINE_STYLE_IMAGE_TYPE_CASTS(StylePendingImage, isPendingImage());
« no previous file with comments | « third_party/WebKit/Source/core/page/PageSerializer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698