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

Side by Side Diff: third_party/WebKit/Source/core/paint/TableSectionPainter.cpp

Issue 2219153002: Offset repeating theads correctly when two tables adjoin at a page border (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/paint/TableSectionPainter.h" 5 #include "core/paint/TableSectionPainter.h"
6 6
7 #include "core/layout/LayoutTableCell.h" 7 #include "core/layout/LayoutTableCell.h"
8 #include "core/layout/LayoutTableCol.h" 8 #include "core/layout/LayoutTableCol.h"
9 #include "core/layout/LayoutTableRow.h" 9 #include "core/layout/LayoutTableRow.h"
10 #include "core/paint/BoxClipper.h" 10 #include "core/paint/BoxClipper.h"
(...skipping 24 matching lines...) Expand all
35 return cell; 35 return cell;
36 } 36 }
37 37
38 void TableSectionPainter::paintRepeatingHeaderGroup(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, const CollapsedBorderValue& currentBorderValue, ItemToPaint itemToPaint) 38 void TableSectionPainter::paintRepeatingHeaderGroup(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, const CollapsedBorderValue& currentBorderValue, ItemToPaint itemToPaint)
39 { 39 {
40 if (!m_layoutTableSection.hasRepeatingHeaderGroup()) 40 if (!m_layoutTableSection.hasRepeatingHeaderGroup())
41 return; 41 return;
42 42
43 LayoutTable* table = m_layoutTableSection.table(); 43 LayoutTable* table = m_layoutTableSection.table();
44 LayoutPoint paginationOffset = paintOffset; 44 LayoutPoint paginationOffset = paintOffset;
45 LayoutUnit pageHeight = table->pageLogicalHeightForOffset(LayoutUnit()); 45 LayoutUnit pageHeight = table->pageLogicalHeightForOffset(LayoutUnit());
mstensho (USE GERRIT) 2016/08/10 09:42:47 (not for this CL) Page height isn't necessarily un
46 // Move paginationOffset to the top of the second page. 46 // Move paginationOffset to the top of the second page.
47 paginationOffset.move(0, pageHeight - table->pageLogicalOffset()); 47 LayoutUnit headerGroupOffset = table->pageLogicalOffset() + m_layoutTableSec tion.paginationStrutForRow(m_layoutTableSection.firstRow(), table->pageLogicalOf fset());
rhogan 2016/08/09 20:34:39 We need to account for any pagination strut on the
mstensho (USE GERRIT) 2016/08/10 09:42:47 Just an observation (probably not something to do
48 LayoutUnit offsetToNextPage = pageHeight - intMod(headerGroupOffset, pageHei ght);
49 paginationOffset.move(0, offsetToNextPage);
48 // Now move paginationOffset to the top of the page the cull rect starts on. 50 // Now move paginationOffset to the top of the page the cull rect starts on.
49 if (paintInfo.cullRect().m_rect.y() > paginationOffset.y()) 51 if (paintInfo.cullRect().m_rect.y() > paginationOffset.y())
50 paginationOffset.move(0, pageHeight * static_cast<int>((paintInfo.cullRe ct().m_rect.y() - paginationOffset.y()) / pageHeight)); 52 paginationOffset.move(0, pageHeight * static_cast<int>((paintInfo.cullRe ct().m_rect.y() - paginationOffset.y()) / pageHeight));
51 LayoutUnit bottomBound = std::min(LayoutUnit(paintInfo.cullRect().m_rect.max Y()), paintOffset.y() + table->logicalHeight()); 53 LayoutUnit bottomBound = std::min(LayoutUnit(paintInfo.cullRect().m_rect.max Y()), paintOffset.y() + table->logicalHeight());
52 while (paginationOffset.y() < bottomBound) { 54 while (paginationOffset.y() < bottomBound) {
53 LayoutPoint nestedOffset = paginationOffset + LayoutPoint(0, m_layoutTab leSection.offsetForRepeatingHeader()); 55 LayoutPoint nestedOffset = paginationOffset + LayoutPoint(0, m_layoutTab leSection.offsetForRepeatingHeader());
54 if (itemToPaint == PaintCollapsedBorders) 56 if (itemToPaint == PaintCollapsedBorders)
55 paintCollapsedSectionBorders(paintInfo, nestedOffset, currentBorderV alue); 57 paintCollapsedSectionBorders(paintInfo, nestedOffset, currentBorderV alue);
56 else 58 else
57 paintSection(paintInfo, nestedOffset); 59 paintSection(paintInfo, nestedOffset);
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 DisplayItem::Type type = shadowStyle == Normal ? DisplayItem::TableSectionBo xShadowNormal : DisplayItem::TableSectionBoxShadowInset; 296 DisplayItem::Type type = shadowStyle == Normal ? DisplayItem::TableSectionBo xShadowNormal : DisplayItem::TableSectionBoxShadowInset;
295 if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.contex t, m_layoutTableSection, type)) 297 if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintInfo.contex t, m_layoutTableSection, type))
296 return; 298 return;
297 299
298 LayoutRect bounds = BoxPainter(m_layoutTableSection).boundsForDrawingRecorde r(paintOffset); 300 LayoutRect bounds = BoxPainter(m_layoutTableSection).boundsForDrawingRecorde r(paintOffset);
299 LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableSection , type, bounds); 301 LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableSection , type, bounds);
300 BoxPainter::paintBoxShadow(paintInfo, LayoutRect(paintOffset, m_layoutTableS ection.size()), m_layoutTableSection.styleRef(), shadowStyle); 302 BoxPainter::paintBoxShadow(paintInfo, LayoutRect(paintOffset, m_layoutTableS ection.size()), m_layoutTableSection.styleRef(), shadowStyle);
301 } 303 }
302 304
303 } // namespace blink 305 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698