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

Side by Side Diff: sky/engine/core/rendering/RenderBox.cpp

Issue 945003002: Remove LayoutState. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: improve test Created 5 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 void RenderBox::layout() 132 void RenderBox::layout()
133 { 133 {
134 ASSERT(needsLayout()); 134 ASSERT(needsLayout());
135 135
136 RenderObject* child = slowFirstChild(); 136 RenderObject* child = slowFirstChild();
137 if (!child) { 137 if (!child) {
138 clearNeedsLayout(); 138 clearNeedsLayout();
139 return; 139 return;
140 } 140 }
141 141
142 LayoutState state(*this, locationOffset());
143 while (child) { 142 while (child) {
144 child->layoutIfNeeded(); 143 child->layoutIfNeeded();
145 ASSERT(!child->needsLayout()); 144 ASSERT(!child->needsLayout());
146 child = child->nextSibling(); 145 child = child->nextSibling();
147 } 146 }
148 clearNeedsLayout(); 147 clearNeedsLayout();
149 } 148 }
150 149
151 // More IE extensions. clientWidth and clientHeight represent the interior of a n object 150 // More IE extensions. clientWidth and clientHeight represent the interior of a n object
152 // excluding border and scrollbar. 151 // excluding border and scrollbar.
(...skipping 2883 matching lines...) Expand 10 before | Expand all | Expand 10 after
3036 3035
3037 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) 3036 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style)
3038 { 3037 {
3039 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); 3038 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor);
3040 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); 3039 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage();
3041 ASSERT(hasBackground == style.hasBackground()); 3040 ASSERT(hasBackground == style.hasBackground());
3042 hasBorder = style.hasBorder(); 3041 hasBorder = style.hasBorder();
3043 } 3042 }
3044 3043
3045 } // namespace blink 3044 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698