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

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

Issue 2696183002: Migrate WTF::HashSet::remove() to ::erase() [part 1] (Closed)
Patch Set: one more platform-specific reference 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) 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 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 // If there are previously intruding floats that no longer intrude, then 1407 // If there are previously intruding floats that no longer intrude, then
1408 // children with floats should also get layout because they might need their 1408 // children with floats should also get layout because they might need their
1409 // floating object lists cleared. 1409 // floating object lists cleared.
1410 if (m_floatingObjects->set().size() < oldIntrudingFloatSet.size()) { 1410 if (m_floatingObjects->set().size() < oldIntrudingFloatSet.size()) {
1411 markAllDescendantsWithFloatsForLayout(); 1411 markAllDescendantsWithFloatsForLayout();
1412 } else { 1412 } else {
1413 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); 1413 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
1414 FloatingObjectSetIterator end = floatingObjectSet.end(); 1414 FloatingObjectSetIterator end = floatingObjectSet.end();
1415 for (FloatingObjectSetIterator it = floatingObjectSet.begin(); 1415 for (FloatingObjectSetIterator it = floatingObjectSet.begin();
1416 it != end && !oldIntrudingFloatSet.isEmpty(); ++it) 1416 it != end && !oldIntrudingFloatSet.isEmpty(); ++it)
1417 oldIntrudingFloatSet.remove((*it)->layoutObject()); 1417 oldIntrudingFloatSet.erase((*it)->layoutObject());
1418 if (!oldIntrudingFloatSet.isEmpty()) 1418 if (!oldIntrudingFloatSet.isEmpty())
1419 markAllDescendantsWithFloatsForLayout(); 1419 markAllDescendantsWithFloatsForLayout();
1420 } 1420 }
1421 } 1421 }
1422 } 1422 }
1423 1423
1424 void LayoutBlockFlow::layoutBlockChildren(bool relayoutChildren, 1424 void LayoutBlockFlow::layoutBlockChildren(bool relayoutChildren,
1425 SubtreeLayoutScope& layoutScope, 1425 SubtreeLayoutScope& layoutScope,
1426 LayoutUnit beforeEdge, 1426 LayoutUnit beforeEdge,
1427 LayoutUnit afterEdge) { 1427 LayoutUnit afterEdge) {
(...skipping 3177 matching lines...) Expand 10 before | Expand all | Expand 10 after
4605 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); 4605 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
4606 } 4606 }
4607 4607
4608 void LayoutBlockFlow::invalidateDisplayItemClients( 4608 void LayoutBlockFlow::invalidateDisplayItemClients(
4609 PaintInvalidationReason invalidationReason) const { 4609 PaintInvalidationReason invalidationReason) const {
4610 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( 4610 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
4611 invalidationReason); 4611 invalidationReason);
4612 } 4612 }
4613 4613
4614 } // namespace blink 4614 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698