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

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

Issue 2439463002: Clean up use of LayoutPoint::move() in paintRepeatingHeaderGroup() (Closed)
Patch Set: bug 652792 follow up Created 4 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 LayoutUnit pageHeight = table->pageLogicalHeightForOffset(LayoutUnit()); 53 LayoutUnit pageHeight = table->pageLogicalHeightForOffset(LayoutUnit());
54 54
55 // Move paginationOffset to the top of the next page. 55 // Move paginationOffset to the top of the next page.
56 // The header may have a pagination strut before it so we need to account for 56 // The header may have a pagination strut before it so we need to account for
57 // that when establishing its position. 57 // that when establishing its position.
58 LayoutUnit headerGroupOffset = table->pageLogicalOffset(); 58 LayoutUnit headerGroupOffset = table->pageLogicalOffset();
59 if (LayoutTableRow* row = m_layoutTableSection.firstRow()) 59 if (LayoutTableRow* row = m_layoutTableSection.firstRow())
60 headerGroupOffset += row->paginationStrut(); 60 headerGroupOffset += row->paginationStrut();
61 LayoutUnit offsetToNextPage = 61 LayoutUnit offsetToNextPage =
62 pageHeight - intMod(headerGroupOffset, pageHeight); 62 pageHeight - intMod(headerGroupOffset, pageHeight);
63 paginationOffset.move(0, offsetToNextPage.toInt()); 63 paginationOffset.move(LayoutUnit(), offsetToNextPage);
64 // Now move paginationOffset to the top of the page the cull rect starts on. 64 // Now move paginationOffset to the top of the page the cull rect starts on.
65 if (paintInfo.cullRect().m_rect.y() > paginationOffset.y()) 65 if (paintInfo.cullRect().m_rect.y() > paginationOffset.y()) {
66 paginationOffset.move( 66 paginationOffset.move(LayoutUnit(), pageHeight *
67 0, pageHeight.toInt() * 67 ((paintInfo.cullRect().m_rect.y() -
68 ((paintInfo.cullRect().m_rect.y() - paginationOffset.y()) / 68 paginationOffset.y()) /
69 pageHeight) 69 pageHeight)
70 .toInt()); 70 .toInt());
71 }
71 LayoutUnit bottomBound = 72 LayoutUnit bottomBound =
72 std::min(LayoutUnit(paintInfo.cullRect().m_rect.maxY()), 73 std::min(LayoutUnit(paintInfo.cullRect().m_rect.maxY()),
73 paintOffset.y() + table->logicalHeight()); 74 paintOffset.y() + table->logicalHeight());
74 while (paginationOffset.y() < bottomBound) { 75 while (paginationOffset.y() < bottomBound) {
75 LayoutPoint nestedOffset = 76 LayoutPoint nestedOffset =
76 paginationOffset + 77 paginationOffset +
77 LayoutPoint(0, m_layoutTableSection.offsetForRepeatingHeader().toInt()); 78 LayoutPoint(LayoutUnit(),
79 m_layoutTableSection.offsetForRepeatingHeader());
78 if (itemToPaint == PaintCollapsedBorders) 80 if (itemToPaint == PaintCollapsedBorders)
79 paintCollapsedSectionBorders(paintInfo, nestedOffset, currentBorderValue); 81 paintCollapsedSectionBorders(paintInfo, nestedOffset, currentBorderValue);
80 else 82 else
81 paintSection(paintInfo, nestedOffset); 83 paintSection(paintInfo, nestedOffset);
82 paginationOffset.move(0, pageHeight.toInt()); 84 paginationOffset.move(0, pageHeight.toInt());
83 } 85 }
84 } 86 }
85 87
86 void TableSectionPainter::paint(const PaintInfo& paintInfo, 88 void TableSectionPainter::paint(const PaintInfo& paintInfo,
87 const LayoutPoint& paintOffset) { 89 const LayoutPoint& paintOffset) {
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 LayoutRect bounds = BoxPainter(m_layoutTableSection) 392 LayoutRect bounds = BoxPainter(m_layoutTableSection)
391 .boundsForDrawingRecorder(paintInfo, paintOffset); 393 .boundsForDrawingRecorder(paintInfo, paintOffset);
392 LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableSection, 394 LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutTableSection,
393 type, bounds); 395 type, bounds);
394 BoxPainter::paintBoxShadow( 396 BoxPainter::paintBoxShadow(
395 paintInfo, LayoutRect(paintOffset, m_layoutTableSection.size()), 397 paintInfo, LayoutRect(paintOffset, m_layoutTableSection.size()),
396 m_layoutTableSection.styleRef(), shadowStyle); 398 m_layoutTableSection.styleRef(), shadowStyle);
397 } 399 }
398 400
399 } // namespace blink 401 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698