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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderTableSection.h
diff --git a/Source/core/rendering/RenderTableSection.h b/Source/core/rendering/RenderTableSection.h
index 47252401f7b3ffcde5d62fb95c6d2585f1cc734d..2807af6156b456393a7f5cc446b41275b7157bc6 100644
--- a/Source/core/rendering/RenderTableSection.h
+++ b/Source/core/rendering/RenderTableSection.h
@@ -122,6 +122,21 @@ public:
Length logicalHeight;
};
+ struct SpanningRowsHeight {
+ WTF_MAKE_NONCOPYABLE(SpanningRowsHeight);
+
+ public:
+ SpanningRowsHeight()
+ : totalRowsHeight(0)
+ , spanningCellHeightIgnoringBorderSpacing(0)
+ {
+ }
+
+ Vector<int> rowHeight;
+ int totalRowsHeight;
+ int spanningCellHeightIgnoringBorderSpacing;
+ };
+
const BorderValue& borderAdjoiningTableStart() const
{
if (hasSameDirectionAs(table()))
@@ -226,6 +241,10 @@ private:
void ensureRows(unsigned);
+ void populateSpanningRowsHeightFromCell(RenderTableCell*, struct SpanningRowsHeight&);
+ void distributeExtraRowSpanHeightToPercentRows(RenderTableCell*, int, int&, Vector<int>&);
+ void distributeExtraRowSpanHeightToAutoRows(RenderTableCell*, int, int&, Vector<int>&);
+ void distributeExtraRowSpanHeightToRemainingRows(RenderTableCell*, int, int&, Vector<int>&);
void distributeRowSpanHeightToRows(SpanningRenderTableCells& rowSpanCells);
void distributeExtraLogicalHeightToPercentRows(int& extraLogicalHeight, int totalPercent);

Powered by Google App Engine
This is Rietveld 408576698