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

Side by Side Diff: Source/core/layout/LayoutFieldset.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.h ('k') | Source/core/paint/FieldsetPainter.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 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 27 matching lines...) Expand all
38 using namespace HTMLNames; 38 using namespace HTMLNames;
39 39
40 LayoutFieldset::LayoutFieldset(Element* element) 40 LayoutFieldset::LayoutFieldset(Element* element)
41 : LayoutBlockFlow(element) 41 : LayoutBlockFlow(element)
42 { 42 {
43 } 43 }
44 44
45 void LayoutFieldset::computePreferredLogicalWidths() 45 void LayoutFieldset::computePreferredLogicalWidths()
46 { 46 {
47 LayoutBlockFlow::computePreferredLogicalWidths(); 47 LayoutBlockFlow::computePreferredLogicalWidths();
48 if (LayoutBox* legend = findLegend()) { 48 if (LayoutBox* legend = findInFlowLegend()) {
49 int legendMinWidth = legend->minPreferredLogicalWidth(); 49 int legendMinWidth = legend->minPreferredLogicalWidth();
50 50
51 Length legendMarginLeft = legend->style()->marginLeft(); 51 Length legendMarginLeft = legend->style()->marginLeft();
52 Length legendMarginRight = legend->style()->marginLeft(); 52 Length legendMarginRight = legend->style()->marginLeft();
53 53
54 if (legendMarginLeft.isFixed()) 54 if (legendMarginLeft.isFixed())
55 legendMinWidth += legendMarginLeft.value(); 55 legendMinWidth += legendMarginLeft.value();
56 56
57 if (legendMarginRight.isFixed()) 57 if (legendMarginRight.isFixed())
58 legendMinWidth += legendMarginRight.value(); 58 legendMinWidth += legendMarginRight.value();
59 59
60 m_minPreferredLogicalWidth = max(m_minPreferredLogicalWidth, legendMinWi dth + borderAndPaddingWidth()); 60 m_minPreferredLogicalWidth = max(m_minPreferredLogicalWidth, legendMinWi dth + borderAndPaddingWidth());
61 } 61 }
62 } 62 }
63 63
64 LayoutObject* LayoutFieldset::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&) 64 LayoutObject* LayoutFieldset::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&)
65 { 65 {
66 LayoutBox* legend = findLegend(); 66 LayoutBox* legend = findInFlowLegend();
67 if (legend) { 67 if (legend) {
68 if (relayoutChildren) 68 if (relayoutChildren)
69 legend->setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationRea son::FieldsetChanged); 69 legend->setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationRea son::FieldsetChanged);
70 legend->layoutIfNeeded(); 70 legend->layoutIfNeeded();
71 71
72 LayoutUnit logicalLeft; 72 LayoutUnit logicalLeft;
73 if (style()->isLeftToRightDirection()) { 73 if (style()->isLeftToRightDirection()) {
74 switch (legend->style()->textAlign()) { 74 switch (legend->style()->textAlign()) {
75 case CENTER: 75 case CENTER:
76 logicalLeft = (logicalWidth() - logicalWidthForChild(*legend)) / 2; 76 logicalLeft = (logicalWidth() - logicalWidthForChild(*legend)) / 2;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 } else { 118 } else {
119 collapsedLegendExtent = legendLogicalHeight + marginAfterForChild(*l egend); 119 collapsedLegendExtent = legendLogicalHeight + marginAfterForChild(*l egend);
120 } 120 }
121 121
122 setLogicalTopForChild(*legend, legendLogicalTop); 122 setLogicalTopForChild(*legend, legendLogicalTop);
123 setLogicalHeight(paddingBefore() + collapsedLegendExtent); 123 setLogicalHeight(paddingBefore() + collapsedLegendExtent);
124 } 124 }
125 return legend; 125 return legend;
126 } 126 }
127 127
128 LayoutBox* LayoutFieldset::findLegend(FindLegendOption option) const 128 LayoutBox* LayoutFieldset::findInFlowLegend() const
129 { 129 {
130 for (LayoutObject* legend = firstChild(); legend; legend = legend->nextSibli ng()) { 130 for (LayoutObject* legend = firstChild(); legend; legend = legend->nextSibli ng()) {
131 if (option == IgnoreFloatingOrOutOfFlow && legend->isFloatingOrOutOfFlow Positioned()) 131 if (legend->isFloatingOrOutOfFlowPositioned())
132 continue; 132 continue;
133 133
134 if (isHTMLLegendElement(legend->node())) 134 if (isHTMLLegendElement(legend->node()))
135 return toLayoutBox(legend); 135 return toLayoutBox(legend);
136 } 136 }
137 return nullptr; 137 return nullptr;
138 } 138 }
139 139
140 void LayoutFieldset::paintBoxDecorationBackground(const PaintInfo& paintInfo, co nst LayoutPoint& paintOffset) 140 void LayoutFieldset::paintBoxDecorationBackground(const PaintInfo& paintInfo, co nst LayoutPoint& paintOffset)
141 { 141 {
142 FieldsetPainter(*this).paintBoxDecorationBackground(paintInfo, paintOffset); 142 FieldsetPainter(*this).paintBoxDecorationBackground(paintInfo, paintOffset);
143 } 143 }
144 144
145 void LayoutFieldset::paintMask(const PaintInfo& paintInfo, const LayoutPoint& pa intOffset) 145 void LayoutFieldset::paintMask(const PaintInfo& paintInfo, const LayoutPoint& pa intOffset)
146 { 146 {
147 FieldsetPainter(*this).paintMask(paintInfo, paintOffset); 147 FieldsetPainter(*this).paintMask(paintInfo, paintOffset);
148 } 148 }
149 149
150 } // namespace blink 150 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutFieldset.h ('k') | Source/core/paint/FieldsetPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698