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

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

Issue 2340113003: [layoutng] Make sure to update m_isSelfCollapsing after ng layout (Closed)
Patch Set: Created 4 years, 3 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 setPageLogicalOffset(layoutView->layoutState()->pageLogicalOffset(*this, logicalTop())); 405 setPageLogicalOffset(layoutView->layoutState()->pageLogicalOffset(*this, logicalTop()));
406 406
407 updateLayerTransformAfterLayout(); 407 updateLayerTransformAfterLayout();
408 408
409 updateAfterLayout(); 409 updateAfterLayout();
410 410
411 if (isHTMLDialogElement(node()) && isOutOfFlowPositioned()) 411 if (isHTMLDialogElement(node()) && isOutOfFlowPositioned())
412 positionDialog(); 412 positionDialog();
413 413
414 clearNeedsLayout(); 414 clearNeedsLayout();
415 m_isSelfCollapsing = checkIfIsSelfCollapsingBlock(); 415 updateIsSelfCollapsing();
416 } 416 }
417 417
418 DISABLE_CFI_PERF 418 DISABLE_CFI_PERF
419 inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit & pageLogicalHeight, SubtreeLayoutScope& layoutScope) 419 inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit & pageLogicalHeight, SubtreeLayoutScope& layoutScope)
420 { 420 {
421 LayoutUnit oldLeft = logicalLeft(); 421 LayoutUnit oldLeft = logicalLeft();
422 bool logicalWidthChanged = updateLogicalWidthAndColumnWidth(); 422 bool logicalWidthChanged = updateLogicalWidthAndColumnWidth();
423 relayoutChildren |= logicalWidthChanged; 423 relayoutChildren |= logicalWidthChanged;
424 424
425 rebuildFloatsFromIntruding(); 425 rebuildFloatsFromIntruding();
(...skipping 3329 matching lines...) Expand 10 before | Expand all | Expand 10 after
3755 3755
3756 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState); 3756 return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
3757 } 3757 }
3758 3758
3759 void LayoutBlockFlow::invalidateDisplayItemClients(PaintInvalidationReason inval idationReason) const 3759 void LayoutBlockFlow::invalidateDisplayItemClients(PaintInvalidationReason inval idationReason) const
3760 { 3760 {
3761 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(invalidationRe ason); 3761 BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(invalidationRe ason);
3762 } 3762 }
3763 3763
3764 } // namespace blink 3764 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.h ('k') | third_party/WebKit/Source/core/layout/ng/ng_box.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698