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

Side by Side Diff: Source/core/svg/SVGFontFaceElement.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
« no previous file with comments | « Source/core/svg/SVGFontElement.h ('k') | Source/core/svg/SVGFontFaceFormatElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 2 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2008 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 14 matching lines...) Expand all
25 #if ENABLE(SVG_FONTS) 25 #if ENABLE(SVG_FONTS)
26 #include "core/SVGNames.h" 26 #include "core/SVGNames.h"
27 #include "core/svg/SVGElement.h" 27 #include "core/svg/SVGElement.h"
28 #include "wtf/WeakPtr.h" 28 #include "wtf/WeakPtr.h"
29 29
30 namespace blink { 30 namespace blink {
31 31
32 class SVGFontElement; 32 class SVGFontElement;
33 class StyleRuleFontFace; 33 class StyleRuleFontFace;
34 34
35 class SVGFontFaceElement FINAL : public SVGElement { 35 class SVGFontFaceElement final : public SVGElement {
36 DEFINE_WRAPPERTYPEINFO(); 36 DEFINE_WRAPPERTYPEINFO();
37 public: 37 public:
38 DECLARE_NODE_FACTORY(SVGFontFaceElement); 38 DECLARE_NODE_FACTORY(SVGFontFaceElement);
39 39
40 unsigned unitsPerEm() const; 40 unsigned unitsPerEm() const;
41 int xHeight() const; 41 int xHeight() const;
42 float horizontalOriginX() const; 42 float horizontalOriginX() const;
43 float horizontalOriginY() const; 43 float horizontalOriginY() const;
44 float horizontalAdvanceX() const; 44 float horizontalAdvanceX() const;
45 float verticalOriginX() const; 45 float verticalOriginX() const;
46 float verticalOriginY() const; 46 float verticalOriginY() const;
47 float verticalAdvanceY() const; 47 float verticalAdvanceY() const;
48 int ascent() const; 48 int ascent() const;
49 int descent() const; 49 int descent() const;
50 String fontFamily() const; 50 String fontFamily() const;
51 51
52 SVGFontElement* associatedFontElement() const; 52 SVGFontElement* associatedFontElement() const;
53 void rebuildFontFace(); 53 void rebuildFontFace();
54 54
55 StyleRuleFontFace* fontFaceRule() const { return m_fontFaceRule.get(); } 55 StyleRuleFontFace* fontFaceRule() const { return m_fontFaceRule.get(); }
56 WeakPtr<SVGFontFaceElement> createWeakRef() { return m_weakFactory.createWea kPtr(); } 56 WeakPtr<SVGFontFaceElement> createWeakRef() { return m_weakFactory.createWea kPtr(); }
57 57
58 virtual void trace(Visitor*) OVERRIDE; 58 virtual void trace(Visitor*) override;
59 59
60 private: 60 private:
61 explicit SVGFontFaceElement(Document&); 61 explicit SVGFontFaceElement(Document&);
62 62
63 virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERR IDE; 63 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide;
64 64
65 virtual void childrenChanged(const ChildrenChange&) OVERRIDE; 65 virtual void childrenChanged(const ChildrenChange&) override;
66 virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE; 66 virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
67 virtual void removedFrom(ContainerNode*) OVERRIDE; 67 virtual void removedFrom(ContainerNode*) override;
68 68
69 virtual bool rendererIsNeeded(const RenderStyle&) OVERRIDE { return false; } 69 virtual bool rendererIsNeeded(const RenderStyle&) override { return false; }
70 70
71 RefPtrWillBeMember<StyleRuleFontFace> m_fontFaceRule; 71 RefPtrWillBeMember<StyleRuleFontFace> m_fontFaceRule;
72 RawPtrWillBeMember<SVGFontElement> m_fontElement; 72 RawPtrWillBeMember<SVGFontElement> m_fontElement;
73 WeakPtrFactory<SVGFontFaceElement> m_weakFactory; 73 WeakPtrFactory<SVGFontFaceElement> m_weakFactory;
74 }; 74 };
75 75
76 } // namespace blink 76 } // namespace blink
77 77
78 #endif // ENABLE(SVG_FONTS) 78 #endif // ENABLE(SVG_FONTS)
79 #endif // SVGFontFaceElement_h 79 #endif // SVGFontFaceElement_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGFontElement.h ('k') | Source/core/svg/SVGFontFaceFormatElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698