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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp

Issue 2671933002: Migrate WTF::HashMap::add() to ::insert() (Closed)
Patch Set: rebase, add TODOs Created 3 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
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 PassRefPtr<FontData> CSSSegmentedFontFace::getFontData( 95 PassRefPtr<FontData> CSSSegmentedFontFace::getFontData(
96 const FontDescription& fontDescription) { 96 const FontDescription& fontDescription) {
97 if (!isValid()) 97 if (!isValid())
98 return nullptr; 98 return nullptr;
99 99
100 FontTraits desiredTraits = fontDescription.traits(); 100 FontTraits desiredTraits = fontDescription.traits();
101 FontCacheKey key = 101 FontCacheKey key =
102 fontDescription.cacheKey(FontFaceCreationParams(), desiredTraits); 102 fontDescription.cacheKey(FontFaceCreationParams(), desiredTraits);
103 103
104 RefPtr<SegmentedFontData>& fontData = 104 RefPtr<SegmentedFontData>& fontData =
105 m_fontDataTable.add(key, nullptr).storedValue->value; 105 m_fontDataTable.insert(key, nullptr).storedValue->value;
106 if (fontData && fontData->numFaces()) { 106 if (fontData && fontData->numFaces()) {
107 // No release, we have a reference to an object in the cache which should 107 // No release, we have a reference to an object in the cache which should
108 // retain the ref count it has. 108 // retain the ref count it has.
109 return fontData; 109 return fontData;
110 } 110 }
111 111
112 if (!fontData) 112 if (!fontData)
113 fontData = SegmentedFontData::create(); 113 fontData = SegmentedFontData::create();
114 114
115 FontDescription requestedFontDescription(fontDescription); 115 FontDescription requestedFontDescription(fontDescription);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 } 190 }
191 } 191 }
192 192
193 DEFINE_TRACE(CSSSegmentedFontFace) { 193 DEFINE_TRACE(CSSSegmentedFontFace) {
194 visitor->trace(m_fontSelector); 194 visitor->trace(m_fontSelector);
195 visitor->trace(m_firstNonCssConnectedFace); 195 visitor->trace(m_firstNonCssConnectedFace);
196 visitor->trace(m_fontFaces); 196 visitor->trace(m_fontFaces);
197 } 197 }
198 198
199 } // namespace blink 199 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSImageGeneratorValue.cpp ('k') | third_party/WebKit/Source/core/css/CSSValuePool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698