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

Side by Side Diff: Source/platform/fonts/FontDataCache.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/platform/fonts/FontCache.cpp ('k') | Source/platform/fonts/FontDescription.cpp » ('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. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 30 matching lines...) Expand all
41 const unsigned cMaxInactiveFontData = 250; 41 const unsigned cMaxInactiveFontData = 250;
42 const unsigned cTargetInactiveFontData = 200; 42 const unsigned cTargetInactiveFontData = 200;
43 #else 43 #else
44 const unsigned cMaxInactiveFontData = 225; 44 const unsigned cMaxInactiveFontData = 225;
45 const unsigned cTargetInactiveFontData = 200; 45 const unsigned cTargetInactiveFontData = 200;
46 #endif 46 #endif
47 47
48 PassRefPtr<SimpleFontData> FontDataCache::get(const FontPlatformData* platformDa ta, ShouldRetain shouldRetain) 48 PassRefPtr<SimpleFontData> FontDataCache::get(const FontPlatformData* platformDa ta, ShouldRetain shouldRetain)
49 { 49 {
50 if (!platformData) 50 if (!platformData)
51 return 0; 51 return nullptr;
52 52
53 Cache::iterator result = m_cache.find(*platformData); 53 Cache::iterator result = m_cache.find(*platformData);
54 if (result == m_cache.end()) { 54 if (result == m_cache.end()) {
55 pair<RefPtr<SimpleFontData>, unsigned> newValue(SimpleFontData::create(* platformData), shouldRetain == Retain ? 1 : 0); 55 pair<RefPtr<SimpleFontData>, unsigned> newValue(SimpleFontData::create(* platformData), shouldRetain == Retain ? 1 : 0);
56 m_cache.set(*platformData, newValue); 56 m_cache.set(*platformData, newValue);
57 if (shouldRetain == DoNotRetain) 57 if (shouldRetain == DoNotRetain)
58 m_inactiveFontData.add(newValue.first); 58 m_inactiveFontData.add(newValue.first);
59 return newValue.first.release(); 59 return newValue.first.release();
60 } 60 }
61 61
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 bool didWork = fontDataToDelete.size(); 146 bool didWork = fontDataToDelete.size();
147 147
148 fontDataToDelete.clear(); 148 fontDataToDelete.clear();
149 149
150 isPurging = false; 150 isPurging = false;
151 151
152 return didWork; 152 return didWork;
153 } 153 }
154 154
155 } 155 }
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontCache.cpp ('k') | Source/platform/fonts/FontDescription.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698