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

Side by Side Diff: Source/WebCore/rendering/RenderTableSection.cpp

Issue 8343063: Merge 98372 - Crash in WebCore::RenderTableSection::addChild due to assert failure (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « Source/WebCore/rendering/RenderTableRow.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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, 2008, 2009, 2010 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 last = lastChild(); 107 last = lastChild();
108 if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) { 108 if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) {
109 if (beforeChild == last) 109 if (beforeChild == last)
110 beforeChild = last->firstChild(); 110 beforeChild = last->firstChild();
111 last->addChild(child, beforeChild); 111 last->addChild(child, beforeChild);
112 return; 112 return;
113 } 113 }
114 114
115 if (beforeChild && !beforeChild->isAnonymous() && beforeChild->parent() == this) { 115 if (beforeChild && !beforeChild->isAnonymous() && beforeChild->parent() == this) {
116 RenderObject* row = beforeChild->previousSibling(); 116 RenderObject* row = beforeChild->previousSibling();
117 if (row && row->isTableRow()) { 117 if (row && row->isTableRow() && row->isAnonymous()) {
118 ASSERT(row->isAnonymous());
119 row->addChild(child); 118 row->addChild(child);
120 return; 119 return;
121 } 120 }
122 } 121 }
123 122
124 // If beforeChild is inside an anonymous cell/row, insert into the cell or into 123 // If beforeChild is inside an anonymous cell/row, insert into the cell or into
125 // the anonymous row containing it, if there is one. 124 // the anonymous row containing it, if there is one.
126 RenderObject* lastBox = last; 125 RenderObject* lastBox = last;
127 while (lastBox && lastBox->parent()->isAnonymous() && !lastBox->isTableR ow()) 126 while (lastBox && lastBox->parent()->isAnonymous() && !lastBox->isTableR ow())
128 lastBox = lastBox->parent(); 127 lastBox = lastBox->parent();
(...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, point InContainer, cellPoint, action)) { 1272 if (static_cast<RenderObject*>(cell)->nodeAtPoint(request, result, point InContainer, cellPoint, action)) {
1274 updateHitTestResult(result, toLayoutPoint(pointInContainer - cellPoi nt)); 1273 updateHitTestResult(result, toLayoutPoint(pointInContainer - cellPoi nt));
1275 return true; 1274 return true;
1276 } 1275 }
1277 } 1276 }
1278 return false; 1277 return false;
1279 1278
1280 } 1279 }
1281 1280
1282 } // namespace WebCore 1281 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderTableRow.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698