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

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

Issue 6913011: Merge 85355 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 7 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, 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 virtual void setCellLogicalWidths(); 230 virtual void setCellLogicalWidths();
231 231
232 virtual void computeLogicalWidth(); 232 virtual void computeLogicalWidth();
233 233
234 virtual IntRect overflowClipRect(int tx, int ty, OverlayScrollbarSizeRelevan cy relevancy = IgnoreOverlayScrollbarSize); 234 virtual IntRect overflowClipRect(int tx, int ty, OverlayScrollbarSizeRelevan cy relevancy = IgnoreOverlayScrollbarSize);
235 235
236 virtual void addOverflowFromChildren(); 236 virtual void addOverflowFromChildren();
237 237
238 void subtractCaptionRect(IntRect&) const; 238 void subtractCaptionRect(IntRect&) const;
239 239
240 void recalcCaption(RenderBlock*) const;
240 void recalcSections() const; 241 void recalcSections() const;
241 void adjustLogicalHeightForCaption(); 242 void adjustLogicalHeightForCaption();
242 243
243 mutable Vector<int> m_columnPos; 244 mutable Vector<int> m_columnPos;
244 mutable Vector<ColumnStruct> m_columns; 245 mutable Vector<ColumnStruct> m_columns;
245 246
246 mutable RenderBlock* m_caption; 247 mutable RenderBlock* m_caption;
247 mutable RenderTableSection* m_head; 248 mutable RenderTableSection* m_head;
248 mutable RenderTableSection* m_foot; 249 mutable RenderTableSection* m_foot;
249 mutable RenderTableSection* m_firstBody; 250 mutable RenderTableSection* m_firstBody;
(...skipping 22 matching lines...) Expand all
272 ASSERT(!object || object->isTable()); 273 ASSERT(!object || object->isTable());
273 return static_cast<const RenderTable*>(object); 274 return static_cast<const RenderTable*>(object);
274 } 275 }
275 276
276 // This will catch anyone doing an unnecessary cast. 277 // This will catch anyone doing an unnecessary cast.
277 void toRenderTable(const RenderTable*); 278 void toRenderTable(const RenderTable*);
278 279
279 } // namespace WebCore 280 } // namespace WebCore
280 281
281 #endif // RenderTable_h 282 #endif // RenderTable_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698