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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutFieldset.cpp

Issue 2447843002: Revert "Allow to set display "inline" on legend element" (Closed)
Patch Set: Created 4 years, 1 month 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 | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.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 /* 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 } 214 }
215 return legend; 215 return legend;
216 } 216 }
217 217
218 LayoutBox* LayoutFieldset::findInFlowLegend() const { 218 LayoutBox* LayoutFieldset::findInFlowLegend() const {
219 for (LayoutObject* legend = firstChild(); legend; 219 for (LayoutObject* legend = firstChild(); legend;
220 legend = legend->nextSibling()) { 220 legend = legend->nextSibling()) {
221 if (legend->isFloatingOrOutOfFlowPositioned()) 221 if (legend->isFloatingOrOutOfFlowPositioned())
222 continue; 222 continue;
223 223
224 if (isHTMLLegendElement(legend->node())) { 224 if (isHTMLLegendElement(legend->node()))
225 if (legend->isBox()) 225 return toLayoutBox(legend);
226 return toLayoutBox(legend);
227 }
228 } 226 }
229 return nullptr; 227 return nullptr;
230 } 228 }
231 229
232 void LayoutFieldset::paintBoxDecorationBackground( 230 void LayoutFieldset::paintBoxDecorationBackground(
233 const PaintInfo& paintInfo, 231 const PaintInfo& paintInfo,
234 const LayoutPoint& paintOffset) const { 232 const LayoutPoint& paintOffset) const {
235 FieldsetPainter(*this).paintBoxDecorationBackground(paintInfo, paintOffset); 233 FieldsetPainter(*this).paintBoxDecorationBackground(paintInfo, paintOffset);
236 } 234 }
237 235
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 LayoutFlexibleBox::removeChild(oldChild); 296 LayoutFlexibleBox::removeChild(oldChild);
299 m_innerBlock = nullptr; 297 m_innerBlock = nullptr;
300 } else if (oldChild->parent() == this) { 298 } else if (oldChild->parent() == this) {
301 LayoutFlexibleBox::removeChild(oldChild); 299 LayoutFlexibleBox::removeChild(oldChild);
302 } else if (m_innerBlock) { 300 } else if (m_innerBlock) {
303 m_innerBlock->removeChild(oldChild); 301 m_innerBlock->removeChild(oldChild);
304 } 302 }
305 } 303 }
306 304
307 } // namespace blink 305 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698