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

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

Issue 1122453002: Revert of Put LayoutAnalyzer back behind disabled-by-default-blink.debug.layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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 | « Source/core/layout/LayoutBlock.cpp ('k') | 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) 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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 layer->updateDescendantDependentFlags(); 374 layer->updateDescendantDependentFlags();
375 hasVisibleContent = layer->hasVisibleContent(); 375 hasVisibleContent = layer->hasVisibleContent();
376 } 376 }
377 if (hasVisibleContent) 377 if (hasVisibleContent)
378 setShouldInvalidateOverflowForPaint(true); 378 setShouldInvalidateOverflowForPaint(true);
379 } 379 }
380 380
381 if (isHTMLDialogElement(node()) && isOutOfFlowPositioned()) 381 if (isHTMLDialogElement(node()) && isOutOfFlowPositioned())
382 positionDialog(); 382 positionDialog();
383 383
384 if (LayoutAnalyzer* analyzer = frameView()->layoutAnalyzer()) 384 frameView()->layoutAnalyzer().increment((frameRect() == prevRect) ? LayoutAn alyzer::LayoutBlockRectangleDidNotChange : LayoutAnalyzer::LayoutBlockRectangleC hanged);
385 analyzer->increment((frameRect() == prevRect) ? LayoutAnalyzer::LayoutBl ockRectangleDidNotChange : LayoutAnalyzer::LayoutBlockRectangleChanged);
386 385
387 clearNeedsLayout(); 386 clearNeedsLayout();
388 } 387 }
389 388
390 inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit & pageLogicalHeight, SubtreeLayoutScope& layoutScope) 389 inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit & pageLogicalHeight, SubtreeLayoutScope& layoutScope)
391 { 390 {
392 LayoutUnit oldLeft = logicalLeft(); 391 LayoutUnit oldLeft = logicalLeft();
393 bool logicalWidthChanged = updateLogicalWidthAndColumnWidth(); 392 bool logicalWidthChanged = updateLogicalWidthAndColumnWidth();
394 relayoutChildren |= logicalWidthChanged; 393 relayoutChildren |= logicalWidthChanged;
395 394
(...skipping 2759 matching lines...) Expand 10 before | Expand all | Expand 10 after
3155 FrameView* frameView = document().view(); 3154 FrameView* frameView = document().view();
3156 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height(); 3155 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height();
3157 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( ); 3156 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( );
3158 if (size().height() < visibleHeight) 3157 if (size().height() < visibleHeight)
3159 top += (visibleHeight - size().height()) / 2; 3158 top += (visibleHeight - size().height()) / 2;
3160 setY(top); 3159 setY(top);
3161 dialog->setCentered(top); 3160 dialog->setCentered(top);
3162 } 3161 }
3163 3162
3164 } // namespace blink 3163 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698