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

Side by Side Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

Issue 2671933002: Migrate WTF::HashMap::add() to ::insert() (Closed)
Patch Set: 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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> 7 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
8 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 8 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
9 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
10 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 10 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 FontDescription elementFontDescription( 470 FontDescription elementFontDescription(
471 computedStyle->getFontDescription()); 471 computedStyle->getFontDescription());
472 // Reset the computed size to avoid inheriting the zoom factor from the 472 // Reset the computed size to avoid inheriting the zoom factor from the
473 // <canvas> element. 473 // <canvas> element.
474 elementFontDescription.setComputedSize( 474 elementFontDescription.setComputedSize(
475 elementFontDescription.specifiedSize()); 475 elementFontDescription.specifiedSize());
476 fontStyle->setFontDescription(elementFontDescription); 476 fontStyle->setFontDescription(elementFontDescription);
477 fontStyle->font().update(fontStyle->font().getFontSelector()); 477 fontStyle->font().update(fontStyle->font().getFontSelector());
478 canvas()->document().ensureStyleResolver().computeFont(fontStyle.get(), 478 canvas()->document().ensureStyleResolver().computeFont(fontStyle.get(),
479 *parsedStyle); 479 *parsedStyle);
480 m_fontsResolvedUsingCurrentStyle.add(newFont, fontStyle->font()); 480 m_fontsResolvedUsingCurrentStyle.insert(newFont, fontStyle->font());
481 DCHECK(!m_fontLRUList.contains(newFont)); 481 DCHECK(!m_fontLRUList.contains(newFont));
482 m_fontLRUList.add(newFont); 482 m_fontLRUList.add(newFont);
483 pruneLocalFontCache(canvasFontCache->hardMaxFonts()); // hard limit 483 pruneLocalFontCache(canvasFontCache->hardMaxFonts()); // hard limit
484 schedulePruneLocalFontCacheIfNeeded(); // soft limit 484 schedulePruneLocalFontCacheIfNeeded(); // soft limit
485 modifiableState().setFont( 485 modifiableState().setFont(
486 fontStyle->font(), canvas()->document().styleEngine().fontSelector()); 486 fontStyle->font(), canvas()->document().styleEngine().fontSelector());
487 } 487 }
488 } else { 488 } else {
489 Font resolvedFont; 489 Font resolvedFont;
490 if (!canvasFontCache->getFontUsingDefaultStyle(newFont, resolvedFont)) 490 if (!canvasFontCache->getFontUsingDefaultStyle(newFont, resolvedFont))
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 } 1165 }
1166 return true; 1166 return true;
1167 } 1167 }
1168 1168
1169 void CanvasRenderingContext2D::resetUsageTracking() { 1169 void CanvasRenderingContext2D::resetUsageTracking() {
1170 UsageCounters newCounters; 1170 UsageCounters newCounters;
1171 m_usageCounters = newCounters; 1171 m_usageCounters = newCounters;
1172 } 1172 }
1173 1173
1174 } // namespace blink 1174 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698