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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutFlowThread.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) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 } 60 }
61 curr = curr->parent(); 61 curr = curr->parent();
62 } 62 }
63 } 63 }
64 return nullptr; 64 return nullptr;
65 } 65 }
66 66
67 void LayoutFlowThread::removeColumnSetFromThread( 67 void LayoutFlowThread::removeColumnSetFromThread(
68 LayoutMultiColumnSet* columnSet) { 68 LayoutMultiColumnSet* columnSet) {
69 ASSERT(columnSet); 69 ASSERT(columnSet);
70 m_multiColumnSetList.remove(columnSet); 70 m_multiColumnSetList.erase(columnSet);
71 invalidateColumnSets(); 71 invalidateColumnSets();
72 // Clear the interval tree right away, instead of leaving it around with dead 72 // Clear the interval tree right away, instead of leaving it around with dead
73 // objects. Not that anyone _should_ try to access the interval tree when the 73 // objects. Not that anyone _should_ try to access the interval tree when the
74 // column sets are marked as invalid, but this is actually possible if other 74 // column sets are marked as invalid, but this is actually possible if other
75 // parts of the engine has bugs that cause us to not lay out everything that 75 // parts of the engine has bugs that cause us to not lay out everything that
76 // was marked for layout, so that LayoutObject::assertLaidOut() (and a LOT 76 // was marked for layout, so that LayoutObject::assertLaidOut() (and a LOT
77 // of other assertions) fails. 77 // of other assertions) fails.
78 m_multiColumnSetIntervalTree.clear(); 78 m_multiColumnSetIntervalTree.clear();
79 } 79 }
80 80
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded( 233 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(
234 const MultiColumnSetInterval& interval) { 234 const MultiColumnSetInterval& interval) {
235 if (m_result) 235 if (m_result)
236 return; 236 return;
237 if (interval.low() <= m_offset && interval.high() > m_offset) 237 if (interval.low() <= m_offset && interval.high() > m_offset)
238 m_result = interval.data(); 238 m_result = interval.data();
239 } 239 }
240 240
241 } // namespace blink 241 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698