Update To 11.40.268.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 3d9cccb..1f39652 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.h
+++ b/src/third_party/WebKit/Source/core/rendering/style/StyleGeneratedImage.h
@@ -31,27 +31,27 @@ namespace blink {
 class CSSValue;
 class CSSImageGeneratorValue;
 
-class StyleGeneratedImage FINAL : public StyleImage {
+class StyleGeneratedImage final : public StyleImage {
 public:
     static PassRefPtr<StyleGeneratedImage> create(CSSImageGeneratorValue* value)
     {
         return adoptRef(new StyleGeneratedImage(value));
     }
 
-    virtual WrappedImagePtr data() const OVERRIDE { return m_imageGeneratorValue.get(); }
+    virtual WrappedImagePtr data() const override { return m_imageGeneratorValue.get(); }
 
-    virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const OVERRIDE;
+    virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;
 
-    virtual LayoutSize imageSize(const RenderObject*, float multiplier) const OVERRIDE;
-    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;
+    virtual LayoutSize imageSize(const RenderObject*, float multiplier) const override;
+    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(PassRefPtrWillBeRawPtr<CSSImageGeneratorValue>);