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

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

Issue 2776203002: Migrate WTF::Vector::remove() to ::erase() (Closed)
Patch Set: rebase, repatch VectorTest Created 3 years, 8 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) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
10 * 10 *
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 ASSERT(m_captions.find(caption) == kNotFound); 218 ASSERT(m_captions.find(caption) == kNotFound);
219 m_captions.push_back(const_cast<LayoutTableCaption*>(caption)); 219 m_captions.push_back(const_cast<LayoutTableCaption*>(caption));
220 } 220 }
221 221
222 void LayoutTable::removeCaption(const LayoutTableCaption* oldCaption) { 222 void LayoutTable::removeCaption(const LayoutTableCaption* oldCaption) {
223 size_t index = m_captions.find(oldCaption); 223 size_t index = m_captions.find(oldCaption);
224 ASSERT(index != kNotFound); 224 ASSERT(index != kNotFound);
225 if (index == kNotFound) 225 if (index == kNotFound)
226 return; 226 return;
227 227
228 m_captions.remove(index); 228 m_captions.erase(index);
229 } 229 }
230 230
231 void LayoutTable::invalidateCachedColumns() { 231 void LayoutTable::invalidateCachedColumns() {
232 m_columnLayoutObjectsValid = false; 232 m_columnLayoutObjectsValid = false;
233 m_columnLayoutObjects.resize(0); 233 m_columnLayoutObjects.resize(0);
234 } 234 }
235 235
236 void LayoutTable::addColumn(const LayoutTableCol*) { 236 void LayoutTable::addColumn(const LayoutTableCol*) {
237 invalidateCachedColumns(); 237 invalidateCachedColumns();
238 } 238 }
(...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 } 1711 }
1712 1712
1713 LayoutUnit LayoutTable::paddingRight() const { 1713 LayoutUnit LayoutTable::paddingRight() const {
1714 if (collapseBorders()) 1714 if (collapseBorders())
1715 return LayoutUnit(); 1715 return LayoutUnit();
1716 1716
1717 return LayoutBlock::paddingRight(); 1717 return LayoutBlock::paddingRight();
1718 } 1718 }
1719 1719
1720 } // namespace blink 1720 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698