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

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

Issue 10809080: Merge 123062 - Crash in RenderTableSection::addCell. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « Source/WebCore/rendering/RenderTable.h ('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, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights 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 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 *endEdge = endCol == col; 763 *endEdge = endCol == col;
764 return columnRenderer; 764 return columnRenderer;
765 } 765 }
766 } 766 }
767 767
768 return 0; 768 return 0;
769 } 769 }
770 770
771 void RenderTable::recalcSections() const 771 void RenderTable::recalcSections() const
772 { 772 {
773 ASSERT(m_needsSectionRecalc);
774
773 m_head = 0; 775 m_head = 0;
774 m_foot = 0; 776 m_foot = 0;
775 m_firstBody = 0; 777 m_firstBody = 0;
776 m_hasColElements = false; 778 m_hasColElements = false;
777 m_captions.clear(); 779 m_captions.clear();
778 780
779 // We need to get valid pointers to caption, head, foot and first body again 781 // We need to get valid pointers to caption, head, foot and first body again
780 RenderObject* nextSibling; 782 RenderObject* nextSibling;
781 for (RenderObject* child = firstChild(); child; child = nextSibling) { 783 for (RenderObject* child = firstChild(); child; child = nextSibling) {
782 nextSibling = child->nextSibling(); 784 nextSibling = child->nextSibling();
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const 1304 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel l* cell) const
1303 { 1305 {
1304 ASSERT(cell->isFirstOrLastCellInRow()); 1306 ASSERT(cell->isFirstOrLastCellInRow());
1305 if (cell->section()->hasSameDirectionAsTable()) 1307 if (cell->section()->hasSameDirectionAsTable())
1306 return style()->borderEnd(); 1308 return style()->borderEnd();
1307 1309
1308 return style()->borderStart(); 1310 return style()->borderStart();
1309 } 1311 }
1310 1312
1311 } 1313 }
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderTable.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698