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

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

Issue 2560123003: Revert commit# 415577 "Add grid/flex layout support for <fieldset>" (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
Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
index 3a054b138f2d26cf17881e4768876f66d9bdf5c9..d5157a9695c6a32a47d31916f3253494c8154db5 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
@@ -935,11 +935,6 @@ void LayoutFlexibleBox::layoutFlexItems(bool relayoutChildren,
PaintLayerScrollableArea::PreventRelayoutScope preventRelayoutScope(
layoutScope);
- // Fieldsets need to find their legend and position it inside the border of
- // the object. The legend then gets skipped during normal layout. It
- // doesn't get included in the normal layout process but is instead skipped.
- LayoutObject* childToExclude =
- layoutSpecialExcludedChild(relayoutChildren, layoutScope);
// Set up our master list of flex items. All of the rest of the algorithm
// should work off this list of a subset.
@@ -949,9 +944,6 @@ void LayoutFlexibleBox::layoutFlexItems(bool relayoutChildren,
m_orderIterator.first();
for (LayoutBox* child = m_orderIterator.currentChild(); child;
child = m_orderIterator.next()) {
- if (childToExclude == child)
- continue; // Skip this child, since it will be positioned by the
- // specialized subclass (fieldsets runs).
if (child->isOutOfFlowPositioned()) {
// Out-of-flow children are not flex items, so we skip them here.
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h ('k') | third_party/WebKit/Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698