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

Side by Side Diff: Source/core/layout/LayoutBlock.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/LayoutAnalyzer.cpp ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after
1617 LayoutUnit oldClientAfterEdge = hasOverflowModel() ? m_overflow->layoutC lientAfterEdge() : clientLogicalBottom(); 1617 LayoutUnit oldClientAfterEdge = hasOverflowModel() ? m_overflow->layoutC lientAfterEdge() : clientLogicalBottom();
1618 computeOverflow(oldClientAfterEdge, true); 1618 computeOverflow(oldClientAfterEdge, true);
1619 } 1619 }
1620 1620
1621 updateLayerTransformAfterLayout(); 1621 updateLayerTransformAfterLayout();
1622 1622
1623 updateScrollInfoAfterLayout(); 1623 updateScrollInfoAfterLayout();
1624 1624
1625 clearNeedsLayout(); 1625 clearNeedsLayout();
1626 1626
1627 if (LayoutAnalyzer* analyzer = frameView()->layoutAnalyzer()) 1627 frameView()->layoutAnalyzer().increment(LayoutAnalyzer::LayoutObjectsThatNee dSimplifiedLayout);
1628 analyzer->increment(LayoutAnalyzer::LayoutObjectsThatNeedSimplifiedLayou t);
1629 1628
1630 return true; 1629 return true;
1631 } 1630 }
1632 1631
1633 void LayoutBlock::markFixedPositionObjectForLayoutIfNeeded(LayoutObject* child, SubtreeLayoutScope& layoutScope) 1632 void LayoutBlock::markFixedPositionObjectForLayoutIfNeeded(LayoutObject* child, SubtreeLayoutScope& layoutScope)
1634 { 1633 {
1635 if (child->style()->position() != FixedPosition) 1634 if (child->style()->position() != FixedPosition)
1636 return; 1635 return;
1637 1636
1638 bool hasStaticBlockPosition = child->style()->hasStaticBlockPosition(isHoriz ontalWritingMode()); 1637 bool hasStaticBlockPosition = child->style()->hasStaticBlockPosition(isHoriz ontalWritingMode());
(...skipping 2277 matching lines...) Expand 10 before | Expand all | Expand 10 after
3916 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 3915 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
3917 { 3916 {
3918 showLayoutObject(); 3917 showLayoutObject();
3919 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 3918 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
3920 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 3919 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
3921 } 3920 }
3922 3921
3923 #endif 3922 #endif
3924 3923
3925 } // namespace blink 3924 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutAnalyzer.cpp ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698