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

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

Issue 47923009: Table rows are incorrectly collapsed in case of hidden cells and rowspans. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review comments addressed Created 6 years, 9 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 Length logicalHeight; 122 Length logicalHeight;
123 }; 123 };
124 124
125 struct SpanningRowsHeight { 125 struct SpanningRowsHeight {
126 WTF_MAKE_NONCOPYABLE(SpanningRowsHeight); 126 WTF_MAKE_NONCOPYABLE(SpanningRowsHeight);
127 127
128 public: 128 public:
129 SpanningRowsHeight() 129 SpanningRowsHeight()
130 : totalRowsHeight(0) 130 : totalRowsHeight(0)
131 , spanningCellHeightIgnoringBorderSpacing(0) 131 , spanningCellHeightIgnoringBorderSpacing(0)
132 , rowWithOnlySpanningCells(false) 132 , isAnyRowWithOnlySpanningCells(false)
133 { 133 {
134 } 134 }
135 135
136 Vector<int> rowHeight; 136 Vector<int> rowHeight;
137 int totalRowsHeight; 137 int totalRowsHeight;
138 int spanningCellHeightIgnoringBorderSpacing; 138 int spanningCellHeightIgnoringBorderSpacing;
139 bool rowWithOnlySpanningCells; 139 bool isAnyRowWithOnlySpanningCells;
140 }; 140 };
141 141
142 const BorderValue& borderAdjoiningTableStart() const 142 const BorderValue& borderAdjoiningTableStart() const
143 { 143 {
144 if (hasSameDirectionAs(table())) 144 if (hasSameDirectionAs(table()))
145 return style()->borderStart(); 145 return style()->borderStart();
146 146
147 return style()->borderEnd(); 147 return style()->borderEnd();
148 } 148 }
149 149
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 // This map holds the collapsed border values for cells with collapsed borde rs. 306 // This map holds the collapsed border values for cells with collapsed borde rs.
307 // It is held at RenderTableSection level to spare memory consumption by tab le cells. 307 // It is held at RenderTableSection level to spare memory consumption by tab le cells.
308 HashMap<pair<const RenderTableCell*, int>, CollapsedBorderValue > m_cellsCol lapsedBorders; 308 HashMap<pair<const RenderTableCell*, int>, CollapsedBorderValue > m_cellsCol lapsedBorders;
309 }; 309 };
310 310
311 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTableSection, isTableSection()); 311 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTableSection, isTableSection());
312 312
313 } // namespace WebCore 313 } // namespace WebCore
314 314
315 #endif // RenderTableSection_h 315 #endif // RenderTableSection_h
OLDNEW
« no previous file with comments | « LayoutTests/platform/win/tables/mozilla/bugs/bug220536-expected.txt ('k') | Source/core/rendering/RenderTableSection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698