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

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

Issue 1852073002: Make sure to save/restore scroll positions in finishDelayUpdateScrollInfo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp ('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/LayoutFlexibleBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
index d39e0314420a1617e4b77eb87ec06d7062d7d32e..12eb291bfba85466e56e178f7c82060e5b4bac9e 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp
@@ -288,8 +288,13 @@ void LayoutFlexibleBox::layoutBlock(bool relayoutChildren)
layoutFlexItems(relayoutChildren, layoutScope);
- if (LayoutBlock::finishDelayUpdateScrollInfo(&layoutScope))
+ ScrollPositionMap scrollMap;
+ if (LayoutBlock::finishDelayUpdateScrollInfo(&layoutScope, &scrollMap)) {
layoutFlexItems(false, layoutScope);
+ for (auto& entry : scrollMap) {
+ entry.key->scrollToPosition(entry.value);
+ }
+ }
if (logicalHeight() != previousHeight)
relayoutChildren = true;
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698