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

Side by Side Diff: Source/core/css/CSSFontFaceSource.h

Issue 129063002: Update CSS classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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/css/CSSFontFaceRule.h ('k') | Source/core/css/CSSFontSelector.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, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 26 matching lines...) Expand all
37 class FontResource; 37 class FontResource;
38 class CSSFontFace; 38 class CSSFontFace;
39 class FontDescription; 39 class FontDescription;
40 class SimpleFontData; 40 class SimpleFontData;
41 #if ENABLE(SVG_FONTS) 41 #if ENABLE(SVG_FONTS)
42 class SVGFontElement; 42 class SVGFontElement;
43 class SVGFontFaceElement; 43 class SVGFontFaceElement;
44 #endif 44 #endif
45 45
46 46
47 class CSSFontFaceSource : public FontResourceClient { 47 class CSSFontFaceSource FINAL : public FontResourceClient {
48 public: 48 public:
49 CSSFontFaceSource(const String&, FontResource* = 0); 49 CSSFontFaceSource(const String&, FontResource* = 0);
50 virtual ~CSSFontFaceSource(); 50 virtual ~CSSFontFaceSource();
51 51
52 bool isLocal() const; 52 bool isLocal() const;
53 bool isLoading() const; 53 bool isLoading() const;
54 bool isLoaded() const; 54 bool isLoaded() const;
55 bool isValid() const; 55 bool isValid() const;
56 56
57 FontResource* resource() { return m_font.get(); } 57 FontResource* resource() { return m_font.get(); }
58 void setFontFace(CSSFontFace* face) { m_face = face; } 58 void setFontFace(CSSFontFace* face) { m_face = face; }
59 59
60 virtual void didStartFontLoad(FontResource*) OVERRIDE; 60 virtual void didStartFontLoad(FontResource*) OVERRIDE;
61 virtual void fontLoaded(FontResource*); 61 virtual void fontLoaded(FontResource*) OVERRIDE;
62 62
63 PassRefPtr<SimpleFontData> getFontData(const FontDescription&); 63 PassRefPtr<SimpleFontData> getFontData(const FontDescription&);
64 64
65 #if ENABLE(SVG_FONTS) 65 #if ENABLE(SVG_FONTS)
66 SVGFontFaceElement* svgFontFaceElement() const; 66 SVGFontFaceElement* svgFontFaceElement() const;
67 void setSVGFontFaceElement(PassRefPtr<SVGFontFaceElement>); 67 void setSVGFontFaceElement(PassRefPtr<SVGFontFaceElement>);
68 bool isSVGFontFaceSource() const; 68 bool isSVGFontFaceSource() const;
69 void setHasExternalSVGFont(bool value) { m_hasExternalSVGFont = value; } 69 void setHasExternalSVGFont(bool value) { m_hasExternalSVGFont = value; }
70 #endif 70 #endif
71 71
(...skipping 27 matching lines...) Expand all
99 #if ENABLE(SVG_FONTS) 99 #if ENABLE(SVG_FONTS)
100 RefPtr<SVGFontFaceElement> m_svgFontFaceElement; 100 RefPtr<SVGFontFaceElement> m_svgFontFaceElement;
101 RefPtr<SVGFontElement> m_externalSVGFontElement; 101 RefPtr<SVGFontElement> m_externalSVGFontElement;
102 bool m_hasExternalSVGFont; 102 bool m_hasExternalSVGFont;
103 #endif 103 #endif
104 }; 104 };
105 105
106 } 106 }
107 107
108 #endif 108 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontFaceRule.h ('k') | Source/core/css/CSSFontSelector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698