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

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

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/RenderBox.cpp ('k') | Source/WebCore/rendering/RenderTable.cpp » ('j') | 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, 2009, 2010 Apple Inc. All rights reserv ed. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Apple Inc. All rights reserv ed.
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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 struct ColumnStruct { 129 struct ColumnStruct {
130 ColumnStruct() 130 ColumnStruct()
131 : span(1) 131 : span(1)
132 { 132 {
133 } 133 }
134 134
135 unsigned span; 135 unsigned span;
136 }; 136 };
137 137
138 void forceSectionsRecalc()
139 {
140 setNeedsSectionRecalc();
141 recalcSections();
142 }
143
138 Vector<ColumnStruct>& columns() { return m_columns; } 144 Vector<ColumnStruct>& columns() { return m_columns; }
139 Vector<int>& columnPositions() { return m_columnPos; } 145 Vector<int>& columnPositions() { return m_columnPos; }
140 RenderTableSection* header() const { return m_head; } 146 RenderTableSection* header() const { return m_head; }
141 RenderTableSection* footer() const { return m_foot; } 147 RenderTableSection* footer() const { return m_foot; }
142 RenderTableSection* firstBody() const { return m_firstBody; } 148 RenderTableSection* firstBody() const { return m_firstBody; }
143 149
144 // This function returns 0 if the table has no section. 150 // This function returns 0 if the table has no section.
145 RenderTableSection* topSection() const; 151 RenderTableSection* topSection() const;
146 RenderTableSection* bottomSection() const; 152 RenderTableSection* bottomSection() const;
147 153
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 ASSERT(!object || object->isTable()); 318 ASSERT(!object || object->isTable());
313 return static_cast<const RenderTable*>(object); 319 return static_cast<const RenderTable*>(object);
314 } 320 }
315 321
316 // This will catch anyone doing an unnecessary cast. 322 // This will catch anyone doing an unnecessary cast.
317 void toRenderTable(const RenderTable*); 323 void toRenderTable(const RenderTable*);
318 324
319 } // namespace WebCore 325 } // namespace WebCore
320 326
321 #endif // RenderTable_h 327 #endif // RenderTable_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBox.cpp ('k') | Source/WebCore/rendering/RenderTable.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698