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

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

Issue 2458823002: Don't establish LayoutState for LayoutTableRow objects. (Closed)
Patch Set: 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 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 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 relayoutChildren = true; 391 relayoutChildren = true;
392 392
393 SubtreeLayoutScope layoutScope(*this); 393 SubtreeLayoutScope layoutScope(*this);
394 LayoutUnit previousHeight = logicalHeight(); 394 LayoutUnit previousHeight = logicalHeight();
395 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight()); 395 setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight());
396 396
397 PaintLayerScrollableArea::DelayScrollOffsetClampScope delayClampScope; 397 PaintLayerScrollableArea::DelayScrollOffsetClampScope delayClampScope;
398 398
399 { 399 {
400 TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layoutScope); 400 TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layoutScope);
401 LayoutState state(*this, locationOffset()); 401 LayoutState state(*this);
402 402
403 m_numberOfInFlowChildrenOnFirstLine = -1; 403 m_numberOfInFlowChildrenOnFirstLine = -1;
404 404
405 prepareOrderIteratorAndMargins(); 405 prepareOrderIteratorAndMargins();
406 406
407 layoutFlexItems(relayoutChildren, layoutScope); 407 layoutFlexItems(relayoutChildren, layoutScope);
408 if (PaintLayerScrollableArea::PreventRelayoutScope::relayoutNeeded()) { 408 if (PaintLayerScrollableArea::PreventRelayoutScope::relayoutNeeded()) {
409 PaintLayerScrollableArea::FreezeScrollbarsScope freezeScrollbarsScope; 409 PaintLayerScrollableArea::FreezeScrollbarsScope freezeScrollbarsScope;
410 prepareOrderIteratorAndMargins(); 410 prepareOrderIteratorAndMargins();
411 layoutFlexItems(true, layoutScope); 411 layoutFlexItems(true, layoutScope);
(...skipping 1836 matching lines...) Expand 10 before | Expand all | Expand 10 after
2248 LayoutUnit originalOffset = 2248 LayoutUnit originalOffset =
2249 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; 2249 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
2250 LayoutUnit newOffset = 2250 LayoutUnit newOffset =
2251 contentExtent - originalOffset - lineCrossAxisExtent; 2251 contentExtent - originalOffset - lineCrossAxisExtent;
2252 adjustAlignmentForChild(*flexItem.box, newOffset - originalOffset); 2252 adjustAlignmentForChild(*flexItem.box, newOffset - originalOffset);
2253 } 2253 }
2254 } 2254 }
2255 } 2255 }
2256 2256
2257 } // namespace blink 2257 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698