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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSCustomFontData.h

Issue 1439033002: Oilpan: tidy up CSSCustomFontData::m_fontFaceSource back ref somewhat. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use WeakPersistent Created 5 years, 1 month 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 | « no previous file | no next file » | 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 #include "platform/heap/Handle.h"
26 27
27 namespace blink { 28 namespace blink {
28 29
29 class CSSCustomFontData final : public CustomFontData { 30 class CSSCustomFontData final : public CustomFontData {
30 public: 31 public:
31 enum FallbackVisibility { InvisibleFallback, VisibleFallback }; 32 enum FallbackVisibility { InvisibleFallback, VisibleFallback };
32 33
33 static PassRefPtr<CSSCustomFontData> create(RemoteFontFaceSource* source, Fa llbackVisibility visibility) 34 static PassRefPtr<CSSCustomFontData> create(RemoteFontFaceSource* source, Fa llbackVisibility visibility)
34 { 35 {
35 return adoptRef(new CSSCustomFontData(source, visibility)); 36 return adoptRef(new CSSCustomFontData(source, visibility));
(...skipping 23 matching lines...) Expand all
59 private: 60 private:
60 CSSCustomFontData(RemoteFontFaceSource* source, FallbackVisibility visibilit y) 61 CSSCustomFontData(RemoteFontFaceSource* source, FallbackVisibility visibilit y)
61 : m_fontFaceSource(source) 62 : m_fontFaceSource(source)
62 , m_fallbackVisibility(visibility) 63 , m_fallbackVisibility(visibility)
63 , m_isLoading(false) 64 , m_isLoading(false)
64 { 65 {
65 if (source) 66 if (source)
66 m_isLoading = source->isLoading(); 67 m_isLoading = source->isLoading();
67 } 68 }
68 69
69 RemoteFontFaceSource* m_fontFaceSource; 70 // TODO(Oilpan): consider moving (Custom)FontFace hierarchy to the heap,
71 // thereby making this reference a Member<>.
72 RawPtrWillBeWeakPersistent<RemoteFontFaceSource> m_fontFaceSource;
70 FallbackVisibility m_fallbackVisibility; 73 FallbackVisibility m_fallbackVisibility;
71 mutable bool m_isLoading; 74 mutable bool m_isLoading;
72 }; 75 };
73 76
74 } 77 } // namespace blink
75 78
76 #endif // CSSCustomFontData_h 79 #endif // CSSCustomFontData_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698