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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutView.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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 // Have any of the old selected objects changed compared to the new selection? 783 // Have any of the old selected objects changed compared to the new selection?
784 for (SelectedObjectMap::iterator i = oldSelectedObjects.begin(); 784 for (SelectedObjectMap::iterator i = oldSelectedObjects.begin();
785 i != oldObjectsEnd; ++i) { 785 i != oldObjectsEnd; ++i) {
786 LayoutObject* obj = i->key; 786 LayoutObject* obj = i->key;
787 SelectionState newSelectionState = obj->getSelectionState(); 787 SelectionState newSelectionState = obj->getSelectionState();
788 SelectionState oldSelectionState = i->value; 788 SelectionState oldSelectionState = i->value;
789 if (newSelectionState != oldSelectionState || 789 if (newSelectionState != oldSelectionState ||
790 (m_selectionStart == obj && oldStartPos != m_selectionStartPos) || 790 (m_selectionStart == obj && oldStartPos != m_selectionStartPos) ||
791 (m_selectionEnd == obj && oldEndPos != m_selectionEndPos)) { 791 (m_selectionEnd == obj && oldEndPos != m_selectionEndPos)) {
792 obj->setShouldInvalidateSelection(); 792 obj->setShouldInvalidateSelection();
793 newSelectedObjects.remove(obj); 793 newSelectedObjects.erase(obj);
794 } 794 }
795 } 795 }
796 796
797 // Any new objects that remain were not found in the old objects dict, and so 797 // Any new objects that remain were not found in the old objects dict, and so
798 // they need to be updated. 798 // they need to be updated.
799 SelectedObjectMap::iterator newObjectsEnd = newSelectedObjects.end(); 799 SelectedObjectMap::iterator newObjectsEnd = newSelectedObjects.end();
800 for (SelectedObjectMap::iterator i = newSelectedObjects.begin(); 800 for (SelectedObjectMap::iterator i = newSelectedObjects.begin();
801 i != newObjectsEnd; ++i) 801 i != newObjectsEnd; ++i)
802 i->key->setShouldInvalidateSelection(); 802 i->key->setShouldInvalidateSelection();
803 803
804 // Have any of the old blocks changed? 804 // Have any of the old blocks changed?
805 SelectedBlockMap::iterator oldBlocksEnd = oldSelectedBlocks.end(); 805 SelectedBlockMap::iterator oldBlocksEnd = oldSelectedBlocks.end();
806 for (SelectedBlockMap::iterator i = oldSelectedBlocks.begin(); 806 for (SelectedBlockMap::iterator i = oldSelectedBlocks.begin();
807 i != oldBlocksEnd; ++i) { 807 i != oldBlocksEnd; ++i) {
808 LayoutBlock* block = i->key; 808 LayoutBlock* block = i->key;
809 SelectionState newSelectionState = block->getSelectionState(); 809 SelectionState newSelectionState = block->getSelectionState();
810 SelectionState oldSelectionState = i->value; 810 SelectionState oldSelectionState = i->value;
811 if (newSelectionState != oldSelectionState) { 811 if (newSelectionState != oldSelectionState) {
812 block->setShouldInvalidateSelection(); 812 block->setShouldInvalidateSelection();
813 newSelectedBlocks.remove(block); 813 newSelectedBlocks.erase(block);
814 } 814 }
815 } 815 }
816 816
817 // Any new blocks that remain were not found in the old blocks dict, and so 817 // Any new blocks that remain were not found in the old blocks dict, and so
818 // they need to be updated. 818 // they need to be updated.
819 SelectedBlockMap::iterator newBlocksEnd = newSelectedBlocks.end(); 819 SelectedBlockMap::iterator newBlocksEnd = newSelectedBlocks.end();
820 for (SelectedBlockMap::iterator i = newSelectedBlocks.begin(); 820 for (SelectedBlockMap::iterator i = newSelectedBlocks.begin();
821 i != newBlocksEnd; ++i) 821 i != newBlocksEnd; ++i)
822 i->key->setShouldInvalidateSelection(); 822 i->key->setShouldInvalidateSelection();
823 } 823 }
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1049 bool LayoutView::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const { 1049 bool LayoutView::paintedOutputOfObjectHasNoEffectRegardlessOfSize() const {
1050 // Frame scroll corner is painted using LayoutView as the display item client. 1050 // Frame scroll corner is painted using LayoutView as the display item client.
1051 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() && 1051 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
1052 (frameView()->horizontalScrollbar() || frameView()->verticalScrollbar())) 1052 (frameView()->horizontalScrollbar() || frameView()->verticalScrollbar()))
1053 return false; 1053 return false;
1054 1054
1055 return LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize(); 1055 return LayoutBlockFlow::paintedOutputOfObjectHasNoEffectRegardlessOfSize();
1056 } 1056 }
1057 1057
1058 } // namespace blink 1058 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698