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

Side by Side Diff: Source/core/rendering/RenderFlexibleBox.cpp

Issue 172753003: Consistently disable the LayoutState for certain layout situations (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 10 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 234
235 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); 235 LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
236 LayoutRectRecorder recorder(*this); 236 LayoutRectRecorder recorder(*this);
237 237
238 if (updateLogicalWidthAndColumnWidth()) 238 if (updateLogicalWidthAndColumnWidth())
239 relayoutChildren = true; 239 relayoutChildren = true;
240 240
241 LayoutUnit previousHeight = logicalHeight(); 241 LayoutUnit previousHeight = logicalHeight();
242 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()) ; 242 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()) ;
243 243
244 LayoutStateMaintainer statePusher(this, locationOffset(), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode()); 244 LayoutStateMaintainer statePusher(this, locationOffset());
245 245
246 RenderFlowThread* flowThread = flowThreadContainingBlock(); 246 RenderFlowThread* flowThread = flowThreadContainingBlock();
247 if (updateRegionsAndShapesLogicalSize(flowThread)) 247 if (updateRegionsAndShapesLogicalSize(flowThread))
248 relayoutChildren = true; 248 relayoutChildren = true;
249 249
250 m_numberOfInFlowChildrenOnFirstLine = -1; 250 m_numberOfInFlowChildrenOnFirstLine = -1;
251 251
252 RenderBlock::startDelayUpdateScrollInfo(); 252 RenderBlock::startDelayUpdateScrollInfo();
253 253
254 prepareOrderIteratorAndMargins(); 254 prepareOrderIteratorAndMargins();
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1402 ASSERT(child); 1402 ASSERT(child);
1403 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent; 1403 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent;
1404 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; 1404 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
1405 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent; 1405 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent;
1406 adjustAlignmentForChild(child, newOffset - originalOffset); 1406 adjustAlignmentForChild(child, newOffset - originalOffset);
1407 } 1407 }
1408 } 1408 }
1409 } 1409 }
1410 1410
1411 } 1411 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698