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

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

Issue 2725063003: Migrate WTF::LinkedHashSet/ListHashSet/HashTable::remove() to ::erase() (Closed)
Patch Set: rebase Created 3 years, 9 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) 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 met: 5 * modification, are permitted provided that the following conditions are met:
6 * 6 *
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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 289
290 bool FontFaceSet::deleteForBinding(ScriptState*, 290 bool FontFaceSet::deleteForBinding(ScriptState*,
291 FontFace* fontFace, 291 FontFace* fontFace,
292 ExceptionState&) { 292 ExceptionState&) {
293 ASSERT(fontFace); 293 ASSERT(fontFace);
294 if (!inActiveDocumentContext()) 294 if (!inActiveDocumentContext())
295 return false; 295 return false;
296 HeapListHashSet<Member<FontFace>>::iterator it = 296 HeapListHashSet<Member<FontFace>>::iterator it =
297 m_nonCSSConnectedFaces.find(fontFace); 297 m_nonCSSConnectedFaces.find(fontFace);
298 if (it != m_nonCSSConnectedFaces.end()) { 298 if (it != m_nonCSSConnectedFaces.end()) {
299 m_nonCSSConnectedFaces.remove(it); 299 m_nonCSSConnectedFaces.erase(it);
300 CSSFontSelector* fontSelector = document()->styleEngine().fontSelector(); 300 CSSFontSelector* fontSelector = document()->styleEngine().fontSelector();
301 fontSelector->fontFaceCache()->removeFontFace(fontFace, false); 301 fontSelector->fontFaceCache()->removeFontFace(fontFace, false);
302 if (fontFace->loadStatus() == FontFace::Loading) 302 if (fontFace->loadStatus() == FontFace::Loading)
303 removeFromLoadingFonts(fontFace); 303 removeFromLoadingFonts(fontFace);
304 fontSelector->fontFaceInvalidated(); 304 fontSelector->fontFaceInvalidated();
305 return true; 305 return true;
306 } 306 }
307 return false; 307 return false;
308 } 308 }
309 309
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 visitor->trace(m_failedFonts); 569 visitor->trace(m_failedFonts);
570 visitor->trace(m_nonCSSConnectedFaces); 570 visitor->trace(m_nonCSSConnectedFaces);
571 visitor->trace(m_asyncRunner); 571 visitor->trace(m_asyncRunner);
572 EventTargetWithInlineData::trace(visitor); 572 EventTargetWithInlineData::trace(visitor);
573 Supplement<Document>::trace(visitor); 573 Supplement<Document>::trace(visitor);
574 SuspendableObject::trace(visitor); 574 SuspendableObject::trace(visitor);
575 FontFace::LoadFontCallback::trace(visitor); 575 FontFace::LoadFontCallback::trace(visitor);
576 } 576 }
577 577
578 } // namespace blink 578 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFaceCache.cpp ('k') | third_party/WebKit/Source/core/css/MediaQueryList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698