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

Side by Side Diff: Source/core/rendering/RenderBox.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
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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 ASSERT(needsLayout()); 301 ASSERT(needsLayout());
302 302
303 LayoutRectRecorder recorder(*this); 303 LayoutRectRecorder recorder(*this);
304 304
305 RenderObject* child = firstChild(); 305 RenderObject* child = firstChild();
306 if (!child) { 306 if (!child) {
307 clearNeedsLayout(); 307 clearNeedsLayout();
308 return; 308 return;
309 } 309 }
310 310
311 LayoutStateMaintainer statePusher(view(), this, locationOffset(), style()->i sFlippedBlocksWritingMode()); 311 LayoutStateMaintainer statePusher(this, locationOffset(), style()->isFlipped BlocksWritingMode());
312 while (child) { 312 while (child) {
313 child->layoutIfNeeded(); 313 child->layoutIfNeeded();
314 ASSERT(!child->needsLayout()); 314 ASSERT(!child->needsLayout());
315 child = child->nextSibling(); 315 child = child->nextSibling();
316 } 316 }
317 statePusher.pop(); 317 statePusher.pop();
318 invalidateBackgroundObscurationStatus(); 318 invalidateBackgroundObscurationStatus();
319 clearNeedsLayout(); 319 clearNeedsLayout();
320 } 320 }
321 321
(...skipping 4351 matching lines...) Expand 10 before | Expand all | Expand 10 after
4673 return 0; 4673 return 0;
4674 4674
4675 if (!layoutState && !flowThreadContainingBlock()) 4675 if (!layoutState && !flowThreadContainingBlock())
4676 return 0; 4676 return 0;
4677 4677
4678 RenderBlock* containerBlock = containingBlock(); 4678 RenderBlock* containerBlock = containingBlock();
4679 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4679 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4680 } 4680 }
4681 4681
4682 } // namespace WebCore 4682 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698