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

Side by Side Diff: Source/core/svg/graphics/SVGImage.h

Issue 631153003: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/svg (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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) 2006 Eric Seidel <eric@webkit.org> 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 21 matching lines...) Expand all
32 #include "platform/weborigin/KURL.h" 32 #include "platform/weborigin/KURL.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 class FrameView; 36 class FrameView;
37 class Page; 37 class Page;
38 class RenderBox; 38 class RenderBox;
39 class SVGImageChromeClient; 39 class SVGImageChromeClient;
40 class SVGImageForContainer; 40 class SVGImageForContainer;
41 41
42 class SVGImage FINAL : public Image { 42 class SVGImage final : public Image {
43 public: 43 public:
44 static PassRefPtr<SVGImage> create(ImageObserver* observer) 44 static PassRefPtr<SVGImage> create(ImageObserver* observer)
45 { 45 {
46 return adoptRef(new SVGImage(observer)); 46 return adoptRef(new SVGImage(observer));
47 } 47 }
48 48
49 static bool isInSVGImage(const Node*); 49 static bool isInSVGImage(const Node*);
50 50
51 RenderBox* embeddedContentBox() const; 51 RenderBox* embeddedContentBox() const;
52 52
53 virtual bool isSVGImage() const OVERRIDE { return true; } 53 virtual bool isSVGImage() const override { return true; }
54 virtual IntSize size() const OVERRIDE { return m_intrinsicSize; } 54 virtual IntSize size() const override { return m_intrinsicSize; }
55 void setURL(const KURL& url) { m_url = url; } 55 void setURL(const KURL& url) { m_url = url; }
56 56
57 virtual bool currentFrameHasSingleSecurityOrigin() const OVERRIDE; 57 virtual bool currentFrameHasSingleSecurityOrigin() const override;
58 58
59 virtual void startAnimation(CatchUpAnimation = CatchUp) OVERRIDE; 59 virtual void startAnimation(CatchUpAnimation = CatchUp) override;
60 virtual void stopAnimation() OVERRIDE; 60 virtual void stopAnimation() override;
61 virtual void resetAnimation() OVERRIDE; 61 virtual void resetAnimation() override;
62 62
63 virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() OVERRIDE; 63 virtual PassRefPtr<NativeImageSkia> nativeImageForCurrentFrame() override;
64 64
65 // Returns the SVG image document's frame. 65 // Returns the SVG image document's frame.
66 FrameView* frameView() const; 66 FrameView* frameView() const;
67 67
68 // Does the SVG image/document contain any animations? 68 // Does the SVG image/document contain any animations?
69 bool hasAnimations() const; 69 bool hasAnimations() const;
70 70
71 private: 71 private:
72 friend class AXRenderObject; 72 friend class AXRenderObject;
73 friend class SVGImageChromeClient; 73 friend class SVGImageChromeClient;
74 friend class SVGImageForContainer; 74 friend class SVGImageForContainer;
75 75
76 virtual ~SVGImage(); 76 virtual ~SVGImage();
77 77
78 78
79 virtual String filenameExtension() const OVERRIDE; 79 virtual String filenameExtension() const override;
80 80
81 virtual void setContainerSize(const IntSize&) OVERRIDE; 81 virtual void setContainerSize(const IntSize&) override;
82 IntSize containerSize() const; 82 IntSize containerSize() const;
83 virtual bool usesContainerSize() const OVERRIDE { return true; } 83 virtual bool usesContainerSize() const override { return true; }
84 virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intr insicHeight, FloatSize& intrinsicRatio) OVERRIDE; 84 virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intr insicHeight, FloatSize& intrinsicRatio) override;
85 85
86 virtual bool dataChanged(bool allDataReceived) OVERRIDE; 86 virtual bool dataChanged(bool allDataReceived) override;
87 87
88 // FIXME: SVGImages are underreporting decoded sizes and will be unable 88 // FIXME: SVGImages are underreporting decoded sizes and will be unable
89 // to prune because these functions are not implemented yet. 89 // to prune because these functions are not implemented yet.
90 virtual void destroyDecodedData(bool) OVERRIDE { } 90 virtual void destroyDecodedData(bool) override { }
91 91
92 // FIXME: Implement this to be less conservative. 92 // FIXME: Implement this to be less conservative.
93 virtual bool currentFrameKnownToBeOpaque() OVERRIDE { return false; } 93 virtual bool currentFrameKnownToBeOpaque() override { return false; }
94 94
95 SVGImage(ImageObserver*); 95 SVGImage(ImageObserver*);
96 virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRe ct& toRect, CompositeOperator, blink::WebBlendMode) OVERRIDE; 96 virtual void draw(GraphicsContext*, const FloatRect& fromRect, const FloatRe ct& toRect, CompositeOperator, blink::WebBlendMode) override;
97 void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatR ect&, const FloatRect&, CompositeOperator, blink::WebBlendMode); 97 void drawForContainer(GraphicsContext*, const FloatSize, float, const FloatR ect&, const FloatRect&, CompositeOperator, blink::WebBlendMode);
98 void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatSize&, const FloatPoint&, 98 void drawPatternForContainer(GraphicsContext*, const FloatSize, float, const FloatRect&, const FloatSize&, const FloatPoint&,
99 CompositeOperator, const FloatRect&, blink::WebBlendMode, const IntSize& repeatSpacing); 99 CompositeOperator, const FloatRect&, blink::WebBlendMode, const IntSize& repeatSpacing);
100 100
101 OwnPtr<SVGImageChromeClient> m_chromeClient; 101 OwnPtr<SVGImageChromeClient> m_chromeClient;
102 OwnPtrWillBePersistent<Page> m_page; 102 OwnPtrWillBePersistent<Page> m_page;
103 IntSize m_intrinsicSize; 103 IntSize m_intrinsicSize;
104 KURL m_url; 104 KURL m_url;
105 }; 105 };
106 106
(...skipping 15 matching lines...) Expand all
122 m_image->setImageObserver(m_observer); 122 m_image->setImageObserver(m_observer);
123 } 123 }
124 private: 124 private:
125 Image* m_image; 125 Image* m_image;
126 ImageObserver* m_observer; 126 ImageObserver* m_observer;
127 }; 127 };
128 128
129 } 129 }
130 130
131 #endif // SVGImage_h 131 #endif // SVGImage_h
OLDNEW
« no previous file with comments | « Source/core/svg/animation/SVGSMILElement.cpp ('k') | Source/core/svg/graphics/SVGImageChromeClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698