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

Side by Side Diff: Source/core/css/FontFaceCache.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/FontFace.h ('k') | Source/core/css/FontFaceSet.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 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 23 matching lines...) Expand all
34 #include "wtf/text/StringHash.h" 34 #include "wtf/text/StringHash.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class FontFace; 38 class FontFace;
39 class CSSFontSelector; 39 class CSSFontSelector;
40 class CSSSegmentedFontFace; 40 class CSSSegmentedFontFace;
41 class FontDescription; 41 class FontDescription;
42 class StyleRuleFontFace; 42 class StyleRuleFontFace;
43 43
44 class FontFaceCache FINAL { 44 class FontFaceCache final {
45 DISALLOW_ALLOCATION(); 45 DISALLOW_ALLOCATION();
46 public: 46 public:
47 FontFaceCache(); 47 FontFaceCache();
48 48
49 // FIXME: Remove CSSFontSelector as argument. Passing CSSFontSelector here i s 49 // FIXME: Remove CSSFontSelector as argument. Passing CSSFontSelector here i s
50 // a result of egregious spaghettification in FontFace/FontFaceSet. 50 // a result of egregious spaghettification in FontFace/FontFaceSet.
51 void add(CSSFontSelector*, const StyleRuleFontFace*, PassRefPtrWillBeRawPtr< FontFace>); 51 void add(CSSFontSelector*, const StyleRuleFontFace*, PassRefPtrWillBeRawPtr< FontFace>);
52 void remove(const StyleRuleFontFace*); 52 void remove(const StyleRuleFontFace*);
53 void clearCSSConnected(); 53 void clearCSSConnected();
54 void clearAll(); 54 void clearAll();
(...skipping 21 matching lines...) Expand all
76 WillBeHeapListHashSet<RefPtrWillBeMember<FontFace> > m_cssConnectedFontFaces ; 76 WillBeHeapListHashSet<RefPtrWillBeMember<FontFace> > m_cssConnectedFontFaces ;
77 77
78 // FIXME: See if this could be ditched 78 // FIXME: See if this could be ditched
79 // Used to compare Font instances, and the usage seems suspect. 79 // Used to compare Font instances, and the usage seems suspect.
80 unsigned m_version; 80 unsigned m_version;
81 }; 81 };
82 82
83 } 83 }
84 84
85 #endif 85 #endif
OLDNEW
« no previous file with comments | « Source/core/css/FontFace.h ('k') | Source/core/css/FontFaceSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698