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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.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 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 } 1106 }
1107 1107
1108 void LayoutBoxModelObject::setContinuation(LayoutBoxModelObject* continuation) { 1108 void LayoutBoxModelObject::setContinuation(LayoutBoxModelObject* continuation) {
1109 if (continuation) { 1109 if (continuation) {
1110 ASSERT(continuation->isLayoutInline() || continuation->isLayoutBlockFlow()); 1110 ASSERT(continuation->isLayoutInline() || continuation->isLayoutBlockFlow());
1111 if (!continuationMap) 1111 if (!continuationMap)
1112 continuationMap = new ContinuationMap; 1112 continuationMap = new ContinuationMap;
1113 continuationMap->set(this, continuation); 1113 continuationMap->set(this, continuation);
1114 } else { 1114 } else {
1115 if (continuationMap) 1115 if (continuationMap)
1116 continuationMap->remove(this); 1116 continuationMap->erase(this);
1117 } 1117 }
1118 } 1118 }
1119 1119
1120 void LayoutBoxModelObject::computeLayerHitTestRects( 1120 void LayoutBoxModelObject::computeLayerHitTestRects(
1121 LayerHitTestRects& rects) const { 1121 LayerHitTestRects& rects) const {
1122 LayoutObject::computeLayerHitTestRects(rects); 1122 LayoutObject::computeLayerHitTestRects(rects);
1123 1123
1124 // If there is a continuation then we need to consult it here, since this is 1124 // If there is a continuation then we need to consult it here, since this is
1125 // the root of the tree walk and it wouldn't otherwise get picked up. 1125 // the root of the tree walk and it wouldn't otherwise get picked up.
1126 // Continuations should always be siblings in the tree, so any others should 1126 // Continuations should always be siblings in the tree, so any others should
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 if (rootElementStyle->hasBackground()) 1352 if (rootElementStyle->hasBackground())
1353 return false; 1353 return false;
1354 1354
1355 if (node() != document().firstBodyElement()) 1355 if (node() != document().firstBodyElement())
1356 return false; 1356 return false;
1357 1357
1358 return true; 1358 return true;
1359 } 1359 }
1360 1360
1361 } // namespace blink 1361 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutCounter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698