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

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

Issue 162613007: Reduce the number of parameters to LayoutStateMaintainer by one (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « no previous file | Source/core/rendering/RenderBlockFlow.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 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 box->layoutIfNeeded(); 1679 box->layoutIfNeeded();
1680 } 1680 }
1681 } 1681 }
1682 } 1682 }
1683 1683
1684 bool RenderBlock::simplifiedLayout() 1684 bool RenderBlock::simplifiedLayout()
1685 { 1685 {
1686 if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout()) || normal ChildNeedsLayout() || selfNeedsLayout()) 1686 if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout()) || normal ChildNeedsLayout() || selfNeedsLayout())
1687 return false; 1687 return false;
1688 1688
1689 LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasColumns () || hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode() ); 1689 LayoutStateMaintainer statePusher(this, locationOffset(), hasColumns() || ha sTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
1690 1690
1691 if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly ()) 1691 if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly ())
1692 return false; 1692 return false;
1693 1693
1694 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(document(), this ); 1694 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(document(), this );
1695 1695
1696 // Lay out positioned descendants or objects that just need to recompute ove rflow. 1696 // Lay out positioned descendants or objects that just need to recompute ove rflow.
1697 if (needsSimplifiedNormalFlowLayout()) 1697 if (needsSimplifiedNormalFlowLayout())
1698 simplifiedNormalFlowLayout(); 1698 simplifiedNormalFlowLayout();
1699 1699
(...skipping 3785 matching lines...) Expand 10 before | Expand all | Expand 10 after
5485 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5485 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5486 { 5486 {
5487 showRenderObject(); 5487 showRenderObject();
5488 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5488 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5489 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5489 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5490 } 5490 }
5491 5491
5492 #endif 5492 #endif
5493 5493
5494 } // namespace WebCore 5494 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698