Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / style / StyleGeneratedImage.h

diff --git a/src/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.h b/src/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.h
index bf93af4..3d9cccb 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.h
+++ b/src/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.h
@@ -26,37 +26,38 @@
 
 #include "core/rendering/style/StyleImage.h"
 
-namespace WebCore {
+namespace blink {
 
 class CSSValue;
 class CSSImageGeneratorValue;
 
-class StyleGeneratedImage : public StyleImage {
+class StyleGeneratedImage FINAL : public StyleImage {
 public:
     static PassRefPtr<StyleGeneratedImage> create(CSSImageGeneratorValue* value)
     {
         return adoptRef(new StyleGeneratedImage(value));
     }
 
-    virtual WrappedImagePtr data() const { return m_imageGeneratorValue.get(); }
+    virtual WrappedImagePtr data() const OVERRIDE { return m_imageGeneratorValue.get(); }
 
-    virtual PassRefPtr<CSSValue> cssValue() const;
+    virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const OVERRIDE;
 
     virtual LayoutSize imageSize(const RenderObject*, float multiplier) const OVERRIDE;
-    virtual bool imageHasRelativeWidth() const { return !m_fixedSize; }
-    virtual bool imageHasRelativeHeight() const { return !m_fixedSize; }
-    virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
-    virtual bool usesImageContainerSize() const { return !m_fixedSize; }
-    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize& containerSize, float) { m_containerSize = containerSize; }
-    virtual void addClient(RenderObject*);
-    virtual void removeClient(RenderObject*);
-    virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const;
+    virtual bool imageHasRelativeWidth() const OVERRIDE { return !m_fixedSize; }
+    virtual bool imageHasRelativeHeight() const OVERRIDE { return !m_fixedSize; }
+    virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) OVERRIDE;
+    virtual bool usesImageContainerSize() const OVERRIDE { return !m_fixedSize; }
+    virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize& containerSize, float) OVERRIDE { m_containerSize = containerSize; }
+    virtual void addClient(RenderObject*) OVERRIDE;
+    virtual void removeClient(RenderObject*) OVERRIDE;
+    virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const OVERRIDE;
     virtual bool knownToBeOpaque(const RenderObject*) const OVERRIDE;
 
 private:
-    StyleGeneratedImage(PassRefPtr<CSSImageGeneratorValue>);
+    StyleGeneratedImage(PassRefPtrWillBeRawPtr<CSSImageGeneratorValue>);
 
-    RefPtr<CSSImageGeneratorValue> m_imageGeneratorValue;
+    // FIXME: oilpan: change to member once StyleImage is moved to the oilpan heap
+    RefPtrWillBePersistent<CSSImageGeneratorValue> m_imageGeneratorValue;
     IntSize m_containerSize;
     bool m_fixedSize;
 };