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

Side by Side Diff: Source/core/css/CSSCustomFontData.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
« no previous file with comments | « Source/core/css/CSSCrossfadeValue.h ('k') | Source/core/css/CSSFilterRule.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) 2013 Google, Inc. 2 * Copyright (C) 2013 Google, Inc.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 * 18 *
19 */ 19 */
20 20
21 #ifndef CSSCustomFontData_h 21 #ifndef CSSCustomFontData_h
22 #define CSSCustomFontData_h 22 #define CSSCustomFontData_h
23 23
24 #include "core/css/CSSFontFaceSource.h" 24 #include "core/css/CSSFontFaceSource.h"
25 #include "platform/fonts/CustomFontData.h" 25 #include "platform/fonts/CustomFontData.h"
26 26
27 namespace blink { 27 namespace blink {
28 28
29 class CSSCustomFontData FINAL : public CustomFontData { 29 class CSSCustomFontData final : public CustomFontData {
30 public: 30 public:
31 enum FallbackVisibility { InvisibleFallback, VisibleFallback }; 31 enum FallbackVisibility { InvisibleFallback, VisibleFallback };
32 32
33 static PassRefPtr<CSSCustomFontData> create(RemoteFontFaceSource* source, Fa llbackVisibility visibility) 33 static PassRefPtr<CSSCustomFontData> create(RemoteFontFaceSource* source, Fa llbackVisibility visibility)
34 { 34 {
35 return adoptRef(new CSSCustomFontData(source, visibility)); 35 return adoptRef(new CSSCustomFontData(source, visibility));
36 } 36 }
37 37
38 virtual ~CSSCustomFontData() { } 38 virtual ~CSSCustomFontData() { }
39 39
40 virtual bool shouldSkipDrawing() const OVERRIDE 40 virtual bool shouldSkipDrawing() const override
41 { 41 {
42 if (m_fontFaceSource) 42 if (m_fontFaceSource)
43 m_fontFaceSource->paintRequested(); 43 m_fontFaceSource->paintRequested();
44 return m_fallbackVisibility == InvisibleFallback && m_isLoading; 44 return m_fallbackVisibility == InvisibleFallback && m_isLoading;
45 } 45 }
46 46
47 virtual void beginLoadIfNeeded() const OVERRIDE 47 virtual void beginLoadIfNeeded() const override
48 { 48 {
49 if (!m_isLoading && m_fontFaceSource) { 49 if (!m_isLoading && m_fontFaceSource) {
50 m_isLoading = true; 50 m_isLoading = true;
51 m_fontFaceSource->beginLoadIfNeeded(); 51 m_fontFaceSource->beginLoadIfNeeded();
52 } 52 }
53 } 53 }
54 54
55 virtual bool isLoading() const OVERRIDE { return m_isLoading; } 55 virtual bool isLoading() const override { return m_isLoading; }
56 virtual bool isLoadingFallback() const OVERRIDE { return true; } 56 virtual bool isLoadingFallback() const override { return true; }
57 virtual void clearFontFaceSource() OVERRIDE { m_fontFaceSource = 0; } 57 virtual void clearFontFaceSource() override { m_fontFaceSource = 0; }
58 58
59 private: 59 private:
60 CSSCustomFontData(RemoteFontFaceSource* source, FallbackVisibility visibilit y) 60 CSSCustomFontData(RemoteFontFaceSource* source, FallbackVisibility visibilit y)
61 : m_fontFaceSource(source) 61 : m_fontFaceSource(source)
62 , m_fallbackVisibility(visibility) 62 , m_fallbackVisibility(visibility)
63 , m_isLoading(false) 63 , m_isLoading(false)
64 { 64 {
65 if (source) 65 if (source)
66 m_isLoading = source->isLoading(); 66 m_isLoading = source->isLoading();
67 } 67 }
68 68
69 RemoteFontFaceSource* m_fontFaceSource; 69 RemoteFontFaceSource* m_fontFaceSource;
70 FallbackVisibility m_fallbackVisibility; 70 FallbackVisibility m_fallbackVisibility;
71 mutable bool m_isLoading; 71 mutable bool m_isLoading;
72 }; 72 };
73 73
74 } 74 }
75 75
76 #endif // CSSCustomFontData_h 76 #endif // CSSCustomFontData_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSCrossfadeValue.h ('k') | Source/core/css/CSSFilterRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698