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

Side by Side Diff: Source/core/paint/TablePainter.cpp

Issue 1224933002: Combine outline and focus ring code paths (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix empty focus ring on Mac Created 5 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/paint/SVGShapePainter.cpp ('k') | Source/core/paint/TableRowPainter.cpp » ('j') | 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 "config.h" 5 #include "config.h"
6 #include "core/paint/TablePainter.h" 6 #include "core/paint/TablePainter.h"
7 7
8 #include "core/layout/LayoutTable.h" 8 #include "core/layout/LayoutTable.h"
9 #include "core/layout/LayoutTableSection.h" 9 #include "core/layout/LayoutTableSection.h"
10 #include "core/style/CollapsedBorderValue.h" 10 #include "core/style/CollapsedBorderValue.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 for (LayoutTableSection* section = m_layoutTable.bottomSection(); se ction; section = m_layoutTable.sectionAbove(section)) { 59 for (LayoutTableSection* section = m_layoutTable.bottomSection(); se ction; section = m_layoutTable.sectionAbove(section)) {
60 LayoutPoint childPoint = m_layoutTable.flipForWritingModeForChil d(section, paintOffset); 60 LayoutPoint childPoint = m_layoutTable.flipForWritingModeForChil d(section, paintOffset);
61 section->paint(info, childPoint); 61 section->paint(info, childPoint);
62 } 62 }
63 } 63 }
64 m_layoutTable.setCurrentBorderValue(0); 64 m_layoutTable.setCurrentBorderValue(0);
65 } 65 }
66 66
67 // Paint outline. 67 // Paint outline.
68 if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && m_layoutTable.style()->hasOutline() && m_layoutTable.style()->visibility() = = VISIBLE) 68 if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) && m_layoutTable.style()->hasOutline() && m_layoutTable.style()->visibility() = = VISIBLE)
69 ObjectPainter(m_layoutTable).paintOutline(paintInfo, m_layoutTable.visua lOverflowRect(), m_layoutTable.size(), paintOffset); 69 ObjectPainter(m_layoutTable).paintOutline(paintInfo, paintOffset);
70 } 70 }
71 71
72 void TablePainter::paintBoxDecorationBackground(const PaintInfo& paintInfo, cons t LayoutPoint& paintOffset) 72 void TablePainter::paintBoxDecorationBackground(const PaintInfo& paintInfo, cons t LayoutPoint& paintOffset)
73 { 73 {
74 if (!paintInfo.shouldPaintWithinRoot(&m_layoutTable)) 74 if (!paintInfo.shouldPaintWithinRoot(&m_layoutTable))
75 return; 75 return;
76 76
77 LayoutRect rect(paintOffset, m_layoutTable.size()); 77 LayoutRect rect(paintOffset, m_layoutTable.size());
78 m_layoutTable.subtractCaptionRect(rect); 78 m_layoutTable.subtractCaptionRect(rect);
79 BoxPainter(m_layoutTable).paintBoxDecorationBackgroundWithRect(paintInfo, pa intOffset, rect); 79 BoxPainter(m_layoutTable).paintBoxDecorationBackgroundWithRect(paintInfo, pa intOffset, rect);
80 } 80 }
81 81
82 void TablePainter::paintMask(const PaintInfo& paintInfo, const LayoutPoint& pain tOffset) 82 void TablePainter::paintMask(const PaintInfo& paintInfo, const LayoutPoint& pain tOffset)
83 { 83 {
84 if (m_layoutTable.style()->visibility() != VISIBLE || paintInfo.phase != Pai ntPhaseMask) 84 if (m_layoutTable.style()->visibility() != VISIBLE || paintInfo.phase != Pai ntPhaseMask)
85 return; 85 return;
86 86
87 if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.conte xt, m_layoutTable, paintInfo.phase)) 87 if (LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(*paintInfo.conte xt, m_layoutTable, paintInfo.phase))
88 return; 88 return;
89 89
90 LayoutRect rect(paintOffset, m_layoutTable.size()); 90 LayoutRect rect(paintOffset, m_layoutTable.size());
91 m_layoutTable.subtractCaptionRect(rect); 91 m_layoutTable.subtractCaptionRect(rect);
92 // TODO(chrishtr): the pixel-snapping here is likely wrong. 92 // TODO(chrishtr): the pixel-snapping here is likely wrong.
93 LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutTable, pain tInfo.phase, rect); 93 LayoutObjectDrawingRecorder recorder(*paintInfo.context, m_layoutTable, pain tInfo.phase, rect);
94 BoxPainter(m_layoutTable).paintMaskImages(paintInfo, rect); 94 BoxPainter(m_layoutTable).paintMaskImages(paintInfo, rect);
95 } 95 }
96 96
97 } // namespace blink 97 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/SVGShapePainter.cpp ('k') | Source/core/paint/TableRowPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698