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

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

Issue 18050007: Height of fixed height cell is not proper when cell's row is under row spanning cell. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 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
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 Apple Inc. All rights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 virtual void paintObject(PaintInfo&, const LayoutPoint&); 225 virtual void paintObject(PaintInfo&, const LayoutPoint&);
226 226
227 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0); 227 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
228 228
229 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE; 229 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;
230 230
231 int borderSpacingForRow(unsigned row) const { return m_grid[row].rowRenderer ? table()->vBorderSpacing() : 0; } 231 int borderSpacingForRow(unsigned row) const { return m_grid[row].rowRenderer ? table()->vBorderSpacing() : 0; }
232 232
233 void ensureRows(unsigned); 233 void ensureRows(unsigned);
234 234
235 int getRowsHeightInRowSpan(RenderTableCell*, int&, Vector<int>&);
236 void recalcRowsHeightInRowSpanningCell(RenderTableCell*, int&, int&, Vector< int>&);
235 void distributeRowSpanHeightToRows(SpanningRenderTableCells& rowSpanCells); 237 void distributeRowSpanHeightToRows(SpanningRenderTableCells& rowSpanCells);
236 238
237 void distributeExtraLogicalHeightToPercentRows(int& extraLogicalHeight, int totalPercent); 239 void distributeExtraLogicalHeightToPercentRows(int& extraLogicalHeight, int totalPercent);
238 void distributeExtraLogicalHeightToAutoRows(int& extraLogicalHeight, unsigne d autoRowsCount); 240 void distributeExtraLogicalHeightToAutoRows(int& extraLogicalHeight, unsigne d autoRowsCount);
239 void distributeRemainingExtraLogicalHeight(int& extraLogicalHeight); 241 void distributeRemainingExtraLogicalHeight(int& extraLogicalHeight);
240 242
241 void updateBaselineForCell(RenderTableCell*, unsigned row, LayoutUnit& basel ineDescent); 243 void updateBaselineForCell(RenderTableCell*, unsigned row, LayoutUnit& basel ineDescent);
242 244
243 bool hasOverflowingCell() const { return m_overflowingCells.size() || m_forc eSlowPaintPathWithOverflowingCell; } 245 bool hasOverflowingCell() const { return m_overflowingCells.size() || m_forc eSlowPaintPathWithOverflowingCell; }
244 void computeOverflowFromCells(unsigned totalRows, unsigned nEffCols); 246 void computeOverflowFromCells(unsigned totalRows, unsigned nEffCols);
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isTableSection()); 301 ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isTableSection());
300 return static_cast<const RenderTableSection*>(object); 302 return static_cast<const RenderTableSection*>(object);
301 } 303 }
302 304
303 // This will catch anyone doing an unnecessary cast. 305 // This will catch anyone doing an unnecessary cast.
304 void toRenderTableSection(const RenderTableSection*); 306 void toRenderTableSection(const RenderTableSection*);
305 307
306 } // namespace WebCore 308 } // namespace WebCore
307 309
308 #endif // RenderTableSection_h 310 #endif // RenderTableSection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698