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

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

Issue 2657443005: Migrate WTF::HashSet::add() to ::insert() [part 1 of N] (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) 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 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 m_floatingObjects->setHorizontalWritingMode(isHorizontalWritingMode()); 1255 m_floatingObjects->setHorizontalWritingMode(isHorizontalWritingMode());
1256 1256
1257 HashSet<LayoutBox*> oldIntrudingFloatSet; 1257 HashSet<LayoutBox*> oldIntrudingFloatSet;
1258 if (!childrenInline() && m_floatingObjects) { 1258 if (!childrenInline() && m_floatingObjects) {
1259 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set(); 1259 const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
1260 FloatingObjectSetIterator end = floatingObjectSet.end(); 1260 FloatingObjectSetIterator end = floatingObjectSet.end();
1261 for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end; 1261 for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end;
1262 ++it) { 1262 ++it) {
1263 const FloatingObject& floatingObject = *it->get(); 1263 const FloatingObject& floatingObject = *it->get();
1264 if (!floatingObject.isDescendant()) 1264 if (!floatingObject.isDescendant())
1265 oldIntrudingFloatSet.add(floatingObject.layoutObject()); 1265 oldIntrudingFloatSet.insert(floatingObject.layoutObject());
1266 } 1266 }
1267 } 1267 }
1268 1268
1269 // Inline blocks are covered by the isAtomicInlineLevel() check in the 1269 // Inline blocks are covered by the isAtomicInlineLevel() check in the
1270 // avoidFloats method. 1270 // avoidFloats method.
1271 if (avoidsFloats() || isDocumentElement() || isLayoutView() || 1271 if (avoidsFloats() || isDocumentElement() || isLayoutView() ||
1272 isFloatingOrOutOfFlowPositioned() || isTableCell()) { 1272 isFloatingOrOutOfFlowPositioned() || isTableCell()) {
1273 if (m_floatingObjects) { 1273 if (m_floatingObjects) {
1274 m_floatingObjects->clear(); 1274 m_floatingObjects->clear();
1275 } 1275 }
(...skipping 3322 matching lines...) Expand 10 before | Expand all | Expand 10 after
4598 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); 4598 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
4599 } 4599 }
4600 4600
4601 void LayoutBlockFlow::invalidateDisplayItemClients( 4601 void LayoutBlockFlow::invalidateDisplayItemClients(
4602 PaintInvalidationReason invalidationReason) const { 4602 PaintInvalidationReason invalidationReason) const {
4603 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients( 4603 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
4604 invalidationReason); 4604 invalidationReason);
4605 } 4605 }
4606 4606
4607 } // namespace blink 4607 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698