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

Side by Side Diff: Source/core/rendering/RenderTableSection.h

Issue 596823002: Tables with specific merge cell configuration render with extra height to tr elements. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years 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, 2013 Apple Inc. All rights reserv ed. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2009, 2013 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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 253
254 virtual void paintObject(const PaintInfo&, const LayoutPoint&) override; 254 virtual void paintObject(const PaintInfo&, const LayoutPoint&) override;
255 255
256 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override; 256 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
257 257
258 int borderSpacingForRow(unsigned row) const { return m_grid[row].rowRenderer ? table()->vBorderSpacing() : 0; } 258 int borderSpacingForRow(unsigned row) const { return m_grid[row].rowRenderer ? table()->vBorderSpacing() : 0; }
259 259
260 void ensureRows(unsigned); 260 void ensureRows(unsigned);
261 261
262 bool rowHasOnlySpanningCells(unsigned); 262 bool rowHasOnlySpanningCells(unsigned);
263 unsigned calcRowHeightHavingOnlySpanningCells(unsigned); 263 unsigned calcRowHeightHavingOnlySpanningCells(unsigned, int&, unsigned, unsi gned&, Vector<int>&);
264 void updateRowsHeightHavingOnlySpanningCells(RenderTableCell*, struct Spanni ngRowsHeight&); 264 void updateRowsHeightHavingOnlySpanningCells(RenderTableCell*, struct Spanni ngRowsHeight&, unsigned&, Vector<int>&);
265 bool isHeightNeededForRowHavingOnlySpanningCells(unsigned);
266 265
267 void populateSpanningRowsHeightFromCell(RenderTableCell*, struct SpanningRow sHeight&); 266 void populateSpanningRowsHeightFromCell(RenderTableCell*, struct SpanningRow sHeight&);
268 void distributeExtraRowSpanHeightToPercentRows(RenderTableCell*, int, int&, Vector<int>&); 267 void distributeExtraRowSpanHeightToPercentRows(RenderTableCell*, int, int&, Vector<int>&);
269 void distributeWholeExtraRowSpanHeightToPercentRows(RenderTableCell*, int, i nt&, Vector<int>&); 268 void distributeWholeExtraRowSpanHeightToPercentRows(RenderTableCell*, int, i nt&, Vector<int>&);
270 void distributeExtraRowSpanHeightToAutoRows(RenderTableCell*, int, int&, Vec tor<int>&); 269 void distributeExtraRowSpanHeightToAutoRows(RenderTableCell*, int, int&, Vec tor<int>&);
271 void distributeExtraRowSpanHeightToRemainingRows(RenderTableCell*, int, int& , Vector<int>&); 270 void distributeExtraRowSpanHeightToRemainingRows(RenderTableCell*, int, int& , Vector<int>&);
272 void distributeRowSpanHeightToRows(SpanningRenderTableCells& rowSpanCells); 271 void distributeRowSpanHeightToRows(SpanningRenderTableCells& rowSpanCells);
273 272
274 void distributeExtraLogicalHeightToPercentRows(int& extraLogicalHeight, int totalPercent); 273 void distributeExtraLogicalHeightToPercentRows(int& extraLogicalHeight, int totalPercent);
275 void distributeExtraLogicalHeightToAutoRows(int& extraLogicalHeight, unsigne d autoRowsCount); 274 void distributeExtraLogicalHeightToAutoRows(int& extraLogicalHeight, unsigne d autoRowsCount);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 }; 331 };
333 332
334 template<> struct VectorTraits<blink::RenderTableSection::RowStruct> : VectorTra itsBase<blink::RenderTableSection::RowStruct> { 333 template<> struct VectorTraits<blink::RenderTableSection::RowStruct> : VectorTra itsBase<blink::RenderTableSection::RowStruct> {
335 static const bool needsDestruction = false; 334 static const bool needsDestruction = false;
336 }; 335 };
337 336
338 } // namespace WTF 337 } // namespace WTF
339 #endif 338 #endif
340 339
341 #endif // RenderTableSection_h 340 #endif // RenderTableSection_h
OLDNEW
« no previous file with comments | « LayoutTests/tables/mozilla/bugs/bug13169-expected.txt ('k') | Source/core/rendering/RenderTableSection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698