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

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

Issue 1746353002: Revert of Fully (?) fix overflow: auto with delayed scroll updates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 unified diff | Download patch
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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 LayoutState state(*this, locationOffset()); 281 LayoutState state(*this, locationOffset());
282 282
283 m_numberOfInFlowChildrenOnFirstLine = -1; 283 m_numberOfInFlowChildrenOnFirstLine = -1;
284 284
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 if (LayoutBlock::finishDelayUpdateScrollInfo(&layoutScope)) 291 LayoutBlock::finishDelayUpdateScrollInfo();
292 layoutFlexItems(false, layoutScope);
293 292
294 if (logicalHeight() != previousHeight) 293 if (logicalHeight() != previousHeight)
295 relayoutChildren = true; 294 relayoutChildren = true;
296 295
297 layoutPositionedObjects(relayoutChildren || isDocumentElement()); 296 layoutPositionedObjects(relayoutChildren || isDocumentElement());
298 297
299 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva lidations for more overflow than it needs to. 298 // FIXME: css3/flexbox/repaint-rtl-column.html seems to issue paint inva lidations for more overflow than it needs to.
300 computeOverflow(clientLogicalBottomAfterRepositioning()); 299 computeOverflow(clientLogicalBottomAfterRepositioning());
301 } 300 }
302 301
(...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 ASSERT(child); 1661 ASSERT(child);
1663 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent; 1662 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent;
1664 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; 1663 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
1665 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent; 1664 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent;
1666 adjustAlignmentForChild(*child, newOffset - originalOffset); 1665 adjustAlignmentForChild(*child, newOffset - originalOffset);
1667 } 1666 }
1668 } 1667 }
1669 } 1668 }
1670 1669
1671 } // namespace blink 1670 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698