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

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

Issue 2759703002: Migrate WTF::HashMap::remove() to ::erase() (Closed)
Patch Set: rebase, fix one platform-specific reference 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) 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 1368 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 } 1379 }
1380 } 1380 }
1381 1381
1382 if (oldFloatingObject->originatingLine() && !selfNeedsLayout()) { 1382 if (oldFloatingObject->originatingLine() && !selfNeedsLayout()) {
1383 ASSERT(oldFloatingObject->originatingLine() 1383 ASSERT(oldFloatingObject->originatingLine()
1384 ->getLineLayoutItem() 1384 ->getLineLayoutItem()
1385 .isEqual(this)); 1385 .isEqual(this));
1386 oldFloatingObject->originatingLine()->markDirty(); 1386 oldFloatingObject->originatingLine()->markDirty();
1387 } 1387 }
1388 1388
1389 floatMap.remove(floatingObject.layoutObject()); 1389 floatMap.erase(floatingObject.layoutObject());
1390 } else { 1390 } else {
1391 changeLogicalTop = LayoutUnit(); 1391 changeLogicalTop = LayoutUnit();
1392 changeLogicalBottom = std::max(changeLogicalBottom, logicalBottom); 1392 changeLogicalBottom = std::max(changeLogicalBottom, logicalBottom);
1393 } 1393 }
1394 } 1394 }
1395 } 1395 }
1396 1396
1397 LayoutBoxToFloatInfoMap::iterator end = floatMap.end(); 1397 LayoutBoxToFloatInfoMap::iterator end = floatMap.end();
1398 for (LayoutBoxToFloatInfoMap::iterator it = floatMap.begin(); it != end; 1398 for (LayoutBoxToFloatInfoMap::iterator it = floatMap.begin(); it != end;
1399 ++it) { 1399 ++it) {
(...skipping 3202 matching lines...) Expand 10 before | Expand all | Expand 10 after
4602 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); 4602 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
4603 } 4603 }
4604 4604
4605 void LayoutBlockFlow::invalidateDisplayItemClients( 4605 void LayoutBlockFlow::invalidateDisplayItemClients(
4606 PaintInvalidationReason invalidationReason) const { 4606 PaintInvalidationReason invalidationReason) const {
4607 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( 4607 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
4608 invalidationReason); 4608 invalidationReason);
4609 } 4609 }
4610 4610
4611 } // namespace blink 4611 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698