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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutFieldset.cpp

Issue 2550963002: Floating legend should be added to the fieldset's anonymous block. (Closed)
Patch Set: Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/forms/fieldset/fieldset-legend-float-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutFieldset.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutFieldset.cpp b/third_party/WebKit/Source/core/layout/LayoutFieldset.cpp
index 1527da1bdd632aaf0803296b2e45862baf241dfd..f0eb1cb0bb31fa10c48ff27296ab5c51a2b96c4b 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFieldset.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFieldset.cpp
@@ -262,7 +262,15 @@ void LayoutFieldset::addChild(LayoutObject* newChild,
if (isHTMLLegendElement(newChild->node())) {
// Let legend block to be the 2nd for correct layout positioning.
newChild->mutableStyle()->setOrder(2);
- LayoutFlexibleBox::addChild(newChild, m_innerBlock);
+
+ // LayoutFlexibleBox::addChild will create an anonymous block if legend is
+ // float. Use the existing fieldset's anonymous block here instead.
+ if (newChild->isFloatingOrOutOfFlowPositioned()) {
+ m_innerBlock->addChild(newChild);
+ } else {
+ LayoutFlexibleBox::addChild(newChild, m_innerBlock);
+ }
+
} else {
if (beforeChild && isHTMLLegendElement(beforeChild->node())) {
m_innerBlock->addChild(newChild);
@@ -285,12 +293,17 @@ void LayoutFieldset::createInnerBlock() {
void LayoutFieldset::removeChild(LayoutObject* oldChild) {
if (isHTMLLegendElement(oldChild->node())) {
- LayoutFlexibleBox::removeChild(oldChild);
- if (m_innerBlock) {
- resetInnerBlockPadding(isHorizontalWritingMode(), m_innerBlock);
- m_innerBlock->setNeedsLayout(LayoutInvalidationReason::FieldsetChanged,
- MarkOnlyThis);
+ if (oldChild->isFloatingOrOutOfFlowPositioned()) {
+ m_innerBlock->removeChild(oldChild);
+ } else {
+ LayoutFlexibleBox::removeChild(oldChild);
+ if (m_innerBlock) {
+ resetInnerBlockPadding(isHorizontalWritingMode(), m_innerBlock);
+ m_innerBlock->setNeedsLayout(LayoutInvalidationReason::FieldsetChanged,
+ MarkOnlyThis);
+ }
}
+
setShouldDoFullPaintInvalidation();
} else if (oldChild == m_innerBlock) {
LayoutFlexibleBox::removeChild(oldChild);
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/forms/fieldset/fieldset-legend-float-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698