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

Unified Diff: Source/WebCore/rendering/style/StyleCachedImage.h

Issue 9424038: Merge 108100 - 2012-02-17 Nate Chapin <japhet@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 10 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 | « no previous file | Source/WebCore/rendering/style/StyleCachedImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/style/StyleCachedImage.h
===================================================================
--- Source/WebCore/rendering/style/StyleCachedImage.h (revision 108251)
+++ Source/WebCore/rendering/style/StyleCachedImage.h (working copy)
@@ -24,16 +24,18 @@
#ifndef StyleCachedImage_h
#define StyleCachedImage_h
+#include "CachedImage.h"
#include "CachedResourceHandle.h"
#include "StyleImage.h"
namespace WebCore {
-class CachedImage;
-
-class StyleCachedImage : public StyleImage {
+class StyleCachedImage : public StyleImage, private CachedImageClient {
+ WTF_MAKE_FAST_ALLOCATED;
public:
static PassRefPtr<StyleCachedImage> create(CachedImage* image) { return adoptRef(new StyleCachedImage(image)); }
+ virtual ~StyleCachedImage();
+
virtual WrappedImagePtr data() const { return m_image.get(); }
virtual PassRefPtr<CSSValue> cssValue() const;
@@ -54,11 +56,7 @@
virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const;
private:
- StyleCachedImage(CachedImage* image)
- : m_image(image)
- {
- m_isCachedImage = true;
- }
+ explicit StyleCachedImage(CachedImage*);
CachedResourceHandle<CachedImage> m_image;
};
« no previous file with comments | « no previous file | Source/WebCore/rendering/style/StyleCachedImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698