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

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

Issue 1857323002: Make sure to clamp scroll positions when restoring them (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 LayoutBlock::startDelayUpdateScrollInfo(); 285 LayoutBlock::startDelayUpdateScrollInfo();
286 286
287 prepareOrderIteratorAndMargins(); 287 prepareOrderIteratorAndMargins();
288 288
289 layoutFlexItems(relayoutChildren, layoutScope); 289 layoutFlexItems(relayoutChildren, layoutScope);
290 290
291 ScrollPositionMap scrollMap; 291 ScrollPositionMap scrollMap;
292 if (LayoutBlock::finishDelayUpdateScrollInfo(&layoutScope, &scrollMap)) { 292 if (LayoutBlock::finishDelayUpdateScrollInfo(&layoutScope, &scrollMap)) {
293 layoutFlexItems(false, layoutScope); 293 layoutFlexItems(false, layoutScope);
294 for (auto& entry : scrollMap) { 294 for (auto& entry : scrollMap) {
295 entry.key->scrollToPosition(entry.value); 295 entry.key->scrollToPosition(entry.value, ScrollOffsetClamped);
296 } 296 }
297 } 297 }
298 298
299 if (logicalHeight() != previousHeight) 299 if (logicalHeight() != previousHeight)
300 relayoutChildren = true; 300 relayoutChildren = true;
301 301
302 layoutPositionedObjects(relayoutChildren || isDocumentElement()); 302 layoutPositionedObjects(relayoutChildren || isDocumentElement());
303 303
304 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva lidations for more overflow than it needs to. 304 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva lidations for more overflow than it needs to.
305 computeOverflow(clientLogicalBottomAfterRepositioning()); 305 computeOverflow(clientLogicalBottomAfterRepositioning());
(...skipping 1361 matching lines...) Expand 10 before | Expand all | Expand 10 after
1667 ASSERT(child); 1667 ASSERT(child);
1668 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent; 1668 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent;
1669 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; 1669 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
1670 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent; 1670 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent;
1671 adjustAlignmentForChild(*child, newOffset - originalOffset); 1671 adjustAlignmentForChild(*child, newOffset - originalOffset);
1672 } 1672 }
1673 } 1673 }
1674 } 1674 }
1675 1675
1676 } // namespace blink 1676 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698