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

Side by Side Diff: Source/core/css/CSSFontFace.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/CSSFilterRule.h ('k') | Source/core/css/CSSFontFaceRule.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 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 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 22 matching lines...) Expand all
33 #include "wtf/Forward.h" 33 #include "wtf/Forward.h"
34 #include "wtf/PassRefPtr.h" 34 #include "wtf/PassRefPtr.h"
35 #include "wtf/Vector.h" 35 #include "wtf/Vector.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class FontDescription; 39 class FontDescription;
40 class RemoteFontFaceSource; 40 class RemoteFontFaceSource;
41 class SimpleFontData; 41 class SimpleFontData;
42 42
43 class CSSFontFace FINAL : public NoBaseWillBeGarbageCollectedFinalized<CSSFontFa ce> { 43 class CSSFontFace final : public NoBaseWillBeGarbageCollectedFinalized<CSSFontFa ce> {
44 public: 44 public:
45 struct UnicodeRange; 45 struct UnicodeRange;
46 class UnicodeRangeSet; 46 class UnicodeRangeSet;
47 47
48 CSSFontFace(FontFace* fontFace, Vector<UnicodeRange>& ranges) 48 CSSFontFace(FontFace* fontFace, Vector<UnicodeRange>& ranges)
49 : m_ranges(ranges) 49 : m_ranges(ranges)
50 , m_segmentedFontFace(nullptr) 50 , m_segmentedFontFace(nullptr)
51 , m_fontFace(fontFace) 51 , m_fontFace(fontFace)
52 { 52 {
53 ASSERT(m_fontFace); 53 ASSERT(m_fontFace);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 UnicodeRangeSet m_ranges; 115 UnicodeRangeSet m_ranges;
116 RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace; 116 RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace;
117 WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource> > m_sources; 117 WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource> > m_sources;
118 RawPtrWillBeMember<FontFace> m_fontFace; 118 RawPtrWillBeMember<FontFace> m_fontFace;
119 }; 119 };
120 120
121 } 121 }
122 122
123 #endif 123 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSFilterRule.h ('k') | Source/core/css/CSSFontFaceRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698