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

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

Issue 1176833002: Removing FindLegendOption (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fixing nits Created 5 years, 6 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 | « Source/core/layout/LayoutFieldset.cpp ('k') | 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 "config.h" 5 #include "config.h"
6 #include "core/paint/FieldsetPainter.h" 6 #include "core/paint/FieldsetPainter.h"
7 7
8 #include "core/layout/LayoutFieldset.h" 8 #include "core/layout/LayoutFieldset.h"
9 #include "core/paint/BoxDecorationData.h" 9 #include "core/paint/BoxDecorationData.h"
10 #include "core/paint/BoxPainter.h" 10 #include "core/paint/BoxPainter.h"
11 #include "core/paint/LayoutObjectDrawingRecorder.h" 11 #include "core/paint/LayoutObjectDrawingRecorder.h"
12 #include "core/paint/PaintInfo.h" 12 #include "core/paint/PaintInfo.h"
13 13
14 namespace blink { 14 namespace blink {
15 15
16 void FieldsetPainter::paintBoxDecorationBackground(const PaintInfo& paintInfo, c onst LayoutPoint& paintOffset) 16 void FieldsetPainter::paintBoxDecorationBackground(const PaintInfo& paintInfo, c onst LayoutPoint& paintOffset)
17 { 17 {
18 if (!paintInfo.shouldPaintWithinRoot(&m_layoutFieldset)) 18 if (!paintInfo.shouldPaintWithinRoot(&m_layoutFieldset))
19 return; 19 return;
20 20
21 LayoutRect paintRect(paintOffset, m_layoutFieldset.size()); 21 LayoutRect paintRect(paintOffset, m_layoutFieldset.size());
22 LayoutBox* legend = m_layoutFieldset.findLegend(); 22 LayoutBox* legend = m_layoutFieldset.findInFlowLegend();
23 if (!legend) 23 if (!legend)
24 return BoxPainter(m_layoutFieldset).paintBoxDecorationBackground(paintIn fo, paintOffset); 24 return BoxPainter(m_layoutFieldset).paintBoxDecorationBackground(paintIn fo, paintOffset);
25 25
26 // FIXME: We need to work with "rl" and "bt" block flow directions. In thos e 26 // FIXME: We need to work with "rl" and "bt" block flow directions. In thos e
27 // cases the legend is embedded in the right and bottom borders respectively . 27 // cases the legend is embedded in the right and bottom borders respectively .
28 // https://bugs.webkit.org/show_bug.cgi?id=47236 28 // https://bugs.webkit.org/show_bug.cgi?id=47236
29 if (m_layoutFieldset.style()->isHorizontalWritingMode()) { 29 if (m_layoutFieldset.style()->isHorizontalWritingMode()) {
30 LayoutUnit yOff = (legend->location().y() > 0) ? LayoutUnit() : (legend- >size().height() - m_layoutFieldset.borderTop()) / 2; 30 LayoutUnit yOff = (legend->location().y() > 0) ? LayoutUnit() : (legend- >size().height() - m_layoutFieldset.borderTop()) / 2;
31 paintRect.setHeight(paintRect.height() - yOff); 31 paintRect.setHeight(paintRect.height() - yOff);
32 paintRect.setY(paintRect.y() + yOff); 32 paintRect.setY(paintRect.y() + yOff);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 BoxPainter::paintBorder(m_layoutFieldset, paintInfo, paintRect, m_layoutFiel dset.styleRef()); 70 BoxPainter::paintBorder(m_layoutFieldset, paintInfo, paintRect, m_layoutFiel dset.styleRef());
71 } 71 }
72 72
73 void FieldsetPainter::paintMask(const PaintInfo& paintInfo, const LayoutPoint& p aintOffset) 73 void FieldsetPainter::paintMask(const PaintInfo& paintInfo, const LayoutPoint& p aintOffset)
74 { 74 {
75 if (m_layoutFieldset.style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask) 75 if (m_layoutFieldset.style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask)
76 return; 76 return;
77 77
78 LayoutRect paintRect = LayoutRect(paintOffset, m_layoutFieldset.size()); 78 LayoutRect paintRect = LayoutRect(paintOffset, m_layoutFieldset.size());
79 LayoutBox* legend = m_layoutFieldset.findLegend(); 79 LayoutBox* legend = m_layoutFieldset.findInFlowLegend();
80 if (!legend) 80 if (!legend)
81 return BoxPainter(m_layoutFieldset).paintMask(paintInfo, paintOffset); 81 return BoxPainter(m_layoutFieldset).paintMask(paintInfo, paintOffset);
82 82
83 // FIXME: We need to work with "rl" and "bt" block flow directions. In thos e 83 // FIXME: We need to work with "rl" and "bt" block flow directions. In thos e
84 // cases the legend is embedded in the right and bottom borders respectively . 84 // cases the legend is embedded in the right and bottom borders respectively .
85 // https://bugs.webkit.org/show_bug.cgi?id=47236 85 // https://bugs.webkit.org/show_bug.cgi?id=47236
86 if (m_layoutFieldset.style()->isHorizontalWritingMode()) { 86 if (m_layoutFieldset.style()->isHorizontalWritingMode()) {
87 LayoutUnit yOff = (legend->location().y() > 0) ? LayoutUnit() : (legend- >size().height() - m_layoutFieldset.borderTop()) / 2; 87 LayoutUnit yOff = (legend->location().y() > 0) ? LayoutUnit() : (legend- >size().height() - m_layoutFieldset.borderTop()) / 2;
88 paintRect.expand(0, -yOff); 88 paintRect.expand(0, -yOff);
89 paintRect.move(0, yOff); 89 paintRect.move(0, yOff);
90 } else { 90 } else {
91 LayoutUnit xOff = (legend->location().x() > 0) ? LayoutUnit() : (legend- >size().width() - m_layoutFieldset.borderLeft()) / 2; 91 LayoutUnit xOff = (legend->location().x() > 0) ? LayoutUnit() : (legend- >size().width() - m_layoutFieldset.borderLeft()) / 2;
92 paintRect.expand(-xOff, 0); 92 paintRect.expand(-xOff, 0);
93 paintRect.move(xOff, 0); 93 paintRect.move(xOff, 0);
94 } 94 }
95 95
96 BoxPainter(m_layoutFieldset).paintMaskImages(paintInfo, paintRect); 96 BoxPainter(m_layoutFieldset).paintMaskImages(paintInfo, paintRect);
97 } 97 }
98 98
99 } // namespace blink 99 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutFieldset.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698