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

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

Issue 880113002: Fix crash when establishing an inline continuation inside a block continuation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: code review Created 5 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) 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. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 } 200 }
201 201
202 if (beforeChild && !beforeChild->isTableSection() && needsTableSection(befor eChild)) 202 if (beforeChild && !beforeChild->isTableSection() && needsTableSection(befor eChild))
203 beforeChild = 0; 203 beforeChild = 0;
204 204
205 LayoutTableSection* section = LayoutTableSection::createAnonymousWithParentR enderer(this); 205 LayoutTableSection* section = LayoutTableSection::createAnonymousWithParentR enderer(this);
206 addChild(section, beforeChild); 206 addChild(section, beforeChild);
207 section->addChild(child); 207 section->addChild(child);
208 } 208 }
209 209
210 void LayoutTable::addChildIgnoringContinuation(RenderObject* newChild, RenderObj ect* beforeChild)
211 {
212 // Tables cannot be continuations. More importantly, we need to bypass the R enderBlock
213 // implementation and instead do a normal addChild(), so that any missing an onymous table part
214 // renderers are inserted.
215 addChild(newChild, beforeChild);
216 }
217
210 void LayoutTable::addCaption(const LayoutTableCaption* caption) 218 void LayoutTable::addCaption(const LayoutTableCaption* caption)
211 { 219 {
212 ASSERT(m_captions.find(caption) == kNotFound); 220 ASSERT(m_captions.find(caption) == kNotFound);
213 m_captions.append(const_cast<LayoutTableCaption*>(caption)); 221 m_captions.append(const_cast<LayoutTableCaption*>(caption));
214 } 222 }
215 223
216 void LayoutTable::removeCaption(const LayoutTableCaption* oldCaption) 224 void LayoutTable::removeCaption(const LayoutTableCaption* oldCaption)
217 { 225 {
218 size_t index = m_captions.find(oldCaption); 226 size_t index = m_captions.find(oldCaption);
219 ASSERT(index != kNotFound); 227 ASSERT(index != kNotFound);
(...skipping 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1344 const BorderValue& LayoutTable::tableEndBorderAdjoiningCell(const LayoutTableCel l* cell) const 1352 const BorderValue& LayoutTable::tableEndBorderAdjoiningCell(const LayoutTableCel l* cell) const
1345 { 1353 {
1346 ASSERT(cell->isFirstOrLastCellInRow()); 1354 ASSERT(cell->isFirstOrLastCellInRow());
1347 if (hasSameDirectionAs(cell->row())) 1355 if (hasSameDirectionAs(cell->row()))
1348 return style()->borderEnd(); 1356 return style()->borderEnd();
1349 1357
1350 return style()->borderStart(); 1358 return style()->borderStart();
1351 } 1359 }
1352 1360
1353 } 1361 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698