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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/InlineTextBox.cpp

Issue 2673543003: Migrate WTF::HashMap::remove() to ::erase() (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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 static_assert(sizeof(InlineTextBox) == sizeof(SameSizeAsInlineTextBox), 49 static_assert(sizeof(InlineTextBox) == sizeof(SameSizeAsInlineTextBox),
50 "InlineTextBox should stay small"); 50 "InlineTextBox should stay small");
51 51
52 typedef WTF::HashMap<const InlineTextBox*, LayoutRect> InlineTextBoxOverflowMap; 52 typedef WTF::HashMap<const InlineTextBox*, LayoutRect> InlineTextBoxOverflowMap;
53 static InlineTextBoxOverflowMap* gTextBoxesWithOverflow; 53 static InlineTextBoxOverflowMap* gTextBoxesWithOverflow;
54 54
55 void InlineTextBox::destroy() { 55 void InlineTextBox::destroy() {
56 AbstractInlineTextBox::willDestroy(this); 56 AbstractInlineTextBox::willDestroy(this);
57 57
58 if (!knownToHaveNoOverflow() && gTextBoxesWithOverflow) 58 if (!knownToHaveNoOverflow() && gTextBoxesWithOverflow)
59 gTextBoxesWithOverflow->remove(this); 59 gTextBoxesWithOverflow->erase(this);
60 InlineTextBoxPainter::removeFromTextBlobCache(*this); 60 InlineTextBoxPainter::removeFromTextBlobCache(*this);
61 InlineBox::destroy(); 61 InlineBox::destroy();
62 } 62 }
63 63
64 void InlineTextBox::offsetRun(int delta) { 64 void InlineTextBox::offsetRun(int delta) {
65 ASSERT(!isDirty()); 65 ASSERT(!isDirty());
66 InlineTextBoxPainter::removeFromTextBlobCache(*this); 66 InlineTextBoxPainter::removeFromTextBlobCache(*this);
67 m_start += delta; 67 m_start += delta;
68 } 68 }
69 69
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 const int layoutObjectCharacterOffset = 75; 688 const int layoutObjectCharacterOffset = 75;
689 for (; printedCharacters < layoutObjectCharacterOffset; printedCharacters++) 689 for (; printedCharacters < layoutObjectCharacterOffset; printedCharacters++)
690 fputc(' ', stderr); 690 fputc(' ', stderr);
691 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), 691 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(),
692 value.utf8().data()); 692 value.utf8().data());
693 } 693 }
694 694
695 #endif 695 #endif
696 696
697 } // namespace blink 697 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698