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

Side by Side Diff: Source/core/rendering/style/StyleGeneratedImage.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 13 matching lines...) Expand all
24 #ifndef StyleGeneratedImage_h 24 #ifndef StyleGeneratedImage_h
25 #define StyleGeneratedImage_h 25 #define StyleGeneratedImage_h
26 26
27 #include "core/rendering/style/StyleImage.h" 27 #include "core/rendering/style/StyleImage.h"
28 28
29 namespace blink { 29 namespace blink {
30 30
31 class CSSValue; 31 class CSSValue;
32 class CSSImageGeneratorValue; 32 class CSSImageGeneratorValue;
33 33
34 class StyleGeneratedImage FINAL : public StyleImage { 34 class StyleGeneratedImage final : public StyleImage {
35 public: 35 public:
36 static PassRefPtr<StyleGeneratedImage> create(CSSImageGeneratorValue* value) 36 static PassRefPtr<StyleGeneratedImage> create(CSSImageGeneratorValue* value)
37 { 37 {
38 return adoptRef(new StyleGeneratedImage(value)); 38 return adoptRef(new StyleGeneratedImage(value));
39 } 39 }
40 40
41 virtual WrappedImagePtr data() const OVERRIDE { return m_imageGeneratorValue .get(); } 41 virtual WrappedImagePtr data() const override { return m_imageGeneratorValue .get(); }
42 42
43 virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const OVERRIDE; 43 virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;
44 44
45 virtual LayoutSize imageSize(const RenderObject*, float multiplier) const OV ERRIDE; 45 virtual LayoutSize imageSize(const RenderObject*, float multiplier) const ov erride;
46 virtual bool imageHasRelativeWidth() const OVERRIDE { return !m_fixedSize; } 46 virtual bool imageHasRelativeWidth() const override { return !m_fixedSize; }
47 virtual bool imageHasRelativeHeight() const OVERRIDE { return !m_fixedSize; } 47 virtual bool imageHasRelativeHeight() const override { return !m_fixedSize; }
48 virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrins icWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) OVERRIDE; 48 virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrins icWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override;
49 virtual bool usesImageContainerSize() const OVERRIDE { return !m_fixedSize; } 49 virtual bool usesImageContainerSize() const override { return !m_fixedSize; }
50 virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize& containerSize, float) OVERRIDE { m_containerSize = containerSize; } 50 virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize& containerSize, float) override { m_containerSize = containerSize; }
51 virtual void addClient(RenderObject*) OVERRIDE; 51 virtual void addClient(RenderObject*) override;
52 virtual void removeClient(RenderObject*) OVERRIDE; 52 virtual void removeClient(RenderObject*) override;
53 virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const OVERRID E; 53 virtual PassRefPtr<Image> image(RenderObject*, const IntSize&) const overrid e;
54 virtual bool knownToBeOpaque(const RenderObject*) const OVERRIDE; 54 virtual bool knownToBeOpaque(const RenderObject*) const override;
55 55
56 private: 56 private:
57 StyleGeneratedImage(PassRefPtrWillBeRawPtr<CSSImageGeneratorValue>); 57 StyleGeneratedImage(PassRefPtrWillBeRawPtr<CSSImageGeneratorValue>);
58 58
59 // FIXME: oilpan: change to member once StyleImage is moved to the oilpan he ap 59 // FIXME: oilpan: change to member once StyleImage is moved to the oilpan he ap
60 RefPtrWillBePersistent<CSSImageGeneratorValue> m_imageGeneratorValue; 60 RefPtrWillBePersistent<CSSImageGeneratorValue> m_imageGeneratorValue;
61 IntSize m_containerSize; 61 IntSize m_containerSize;
62 bool m_fixedSize; 62 bool m_fixedSize;
63 }; 63 };
64 64
65 } 65 }
66 #endif 66 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleFetchedImageSet.h ('k') | Source/core/rendering/style/StylePendingImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698