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

Side by Side Diff: Source/core/css/CSSSegmentedFontFace.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/CSSRuleList.h ('k') | Source/core/css/CSSStyleRule.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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 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 26 matching lines...) Expand all
37 37
38 namespace blink { 38 namespace blink {
39 39
40 class CSSFontFace; 40 class CSSFontFace;
41 class CSSFontSelector; 41 class CSSFontSelector;
42 class FontData; 42 class FontData;
43 class FontDescription; 43 class FontDescription;
44 class FontFace; 44 class FontFace;
45 class SegmentedFontData; 45 class SegmentedFontData;
46 46
47 class CSSSegmentedFontFace FINAL : public RefCountedWillBeGarbageCollectedFinali zed<CSSSegmentedFontFace> { 47 class CSSSegmentedFontFace final : public RefCountedWillBeGarbageCollectedFinali zed<CSSSegmentedFontFace> {
48 public: 48 public:
49 static PassRefPtrWillBeRawPtr<CSSSegmentedFontFace> create(CSSFontSelector* selector, FontTraits traits) 49 static PassRefPtrWillBeRawPtr<CSSSegmentedFontFace> create(CSSFontSelector* selector, FontTraits traits)
50 { 50 {
51 return adoptRefWillBeNoop(new CSSSegmentedFontFace(selector, traits)); 51 return adoptRefWillBeNoop(new CSSSegmentedFontFace(selector, traits));
52 } 52 }
53 ~CSSSegmentedFontFace(); 53 ~CSSSegmentedFontFace();
54 54
55 CSSFontSelector* fontSelector() const { return m_fontSelector; } 55 CSSFontSelector* fontSelector() const { return m_fontSelector; }
56 FontTraits traits() const { return m_traits; } 56 FontTraits traits() const { return m_traits; }
57 57
(...skipping 26 matching lines...) Expand all
84 FontTraits m_traits; 84 FontTraits m_traits;
85 HashMap<unsigned, RefPtr<SegmentedFontData> > m_fontDataTable; 85 HashMap<unsigned, RefPtr<SegmentedFontData> > m_fontDataTable;
86 // All non-CSS-connected FontFaces are stored after the CSS-connected ones. 86 // All non-CSS-connected FontFaces are stored after the CSS-connected ones.
87 FontFaceList m_fontFaces; 87 FontFaceList m_fontFaces;
88 FontFaceList::iterator m_firstNonCssConnectedFace; 88 FontFaceList::iterator m_firstNonCssConnectedFace;
89 }; 89 };
90 90
91 } // namespace blink 91 } // namespace blink
92 92
93 #endif // CSSSegmentedFontFace_h 93 #endif // CSSSegmentedFontFace_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSRuleList.h ('k') | Source/core/css/CSSStyleRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698