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

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

Issue 2471283004: [css-grid] Fix simplified layout of positioned grid items (Closed)
Patch Set: Remove unneeded line in test. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutGrid.h ('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/LayoutGrid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index 05a01b709fbfee65abbd54397c163e4667c2d148..d22825532de58c6611bad2c0e47d683c8e8ef83f 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -475,7 +475,10 @@ void LayoutGrid::repeatTracksSizingIfNeeded(GridSizingData& sizingData,
void LayoutGrid::layoutBlock(bool relayoutChildren) {
ASSERT(needsLayout());
- if (!relayoutChildren && simplifiedLayout())
+ // We cannot perform a simplifiedLayout() on a dirty grid that
+ // has positioned items to be laid out.
+ if (!relayoutChildren && (!m_gridIsDirty || !posChildNeedsLayout()) &&
+ simplifiedLayout())
return;
SubtreeLayoutScope layoutScope(*this);
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutGrid.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698