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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is part of the render object implementation for KHTML. 2 * This file is part of the render object implementation for KHTML.
3 * 3 *
4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
5 * (C) 1999 Antti Koivisto (koivisto@kde.org) 5 * (C) 1999 Antti Koivisto (koivisto@kde.org)
6 * Copyright (C) 2003 Apple Computer, Inc. 6 * Copyright (C) 2003 Apple Computer, Inc.
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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 return child->logicalWidth() - child->borderAndPaddingLogicalWidth(); 168 return child->logicalWidth() - child->borderAndPaddingLogicalWidth();
169 } 169 }
170 170
171 static LayoutUnit contentHeightForChild(LayoutBox* child) 171 static LayoutUnit contentHeightForChild(LayoutBox* child)
172 { 172 {
173 if (child->hasOverrideHeight()) 173 if (child->hasOverrideHeight())
174 return child->overrideLogicalContentHeight(); 174 return child->overrideLogicalContentHeight();
175 return child->logicalHeight() - child->borderAndPaddingLogicalHeight(); 175 return child->logicalHeight() - child->borderAndPaddingLogicalHeight();
176 } 176 }
177 177
178 void LayoutDeprecatedFlexibleBox::styleWillChange(StyleDifference diff, const La youtStyle& newStyle) 178 void LayoutDeprecatedFlexibleBox::styleWillChange(StyleDifference diff, const Co mputedStyle& newStyle)
179 { 179 {
180 const LayoutStyle* oldStyle = style(); 180 const ComputedStyle* oldStyle = style();
181 if (oldStyle && !oldStyle->lineClamp().isNone() && newStyle.lineClamp().isNo ne()) 181 if (oldStyle && !oldStyle->lineClamp().isNone() && newStyle.lineClamp().isNo ne())
182 clearLineClamp(); 182 clearLineClamp();
183 183
184 LayoutBlock::styleWillChange(diff, newStyle); 184 LayoutBlock::styleWillChange(diff, newStyle);
185 } 185 }
186 186
187 void LayoutDeprecatedFlexibleBox::computeIntrinsicLogicalWidths(LayoutUnit& minL ogicalWidth, LayoutUnit& maxLogicalWidth) const 187 void LayoutDeprecatedFlexibleBox::computeIntrinsicLogicalWidths(LayoutUnit& minL ogicalWidth, LayoutUnit& maxLogicalWidth) const
188 { 188 {
189 if (hasMultipleLines() || isVertical()) { 189 if (hasMultipleLines() || isVertical()) {
190 for (LayoutBox* child = firstChildBox(); child; child = child->nextSibli ngBox()) { 190 for (LayoutBox* child = firstChildBox(); child; child = child->nextSibli ngBox()) {
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 if (isFloating()) 1024 if (isFloating())
1025 return "LayoutDeprecatedFlexibleBox (floating)"; 1025 return "LayoutDeprecatedFlexibleBox (floating)";
1026 if (isAnonymous()) 1026 if (isAnonymous())
1027 return "LayoutDeprecatedFlexibleBox (anonymous)"; 1027 return "LayoutDeprecatedFlexibleBox (anonymous)";
1028 if (isRelPositioned()) 1028 if (isRelPositioned())
1029 return "LayoutDeprecatedFlexibleBox (relative positioned)"; 1029 return "LayoutDeprecatedFlexibleBox (relative positioned)";
1030 return "LayoutDeprecatedFlexibleBox"; 1030 return "LayoutDeprecatedFlexibleBox";
1031 } 1031 }
1032 1032
1033 } // namespace blink 1033 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutDeprecatedFlexibleBox.h ('k') | Source/core/layout/LayoutFileUploadControl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698