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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated change after Doug's review. 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderCombineText.cpp ('k') | Source/core/rendering/RenderInline.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 * 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 static LayoutUnit contentHeightForChild(RenderBox* child) 170 static LayoutUnit contentHeightForChild(RenderBox* child)
171 { 171 {
172 if (child->hasOverrideHeight()) 172 if (child->hasOverrideHeight())
173 return child->overrideLogicalContentHeight(); 173 return child->overrideLogicalContentHeight();
174 return child->logicalHeight() - child->borderAndPaddingLogicalHeight(); 174 return child->logicalHeight() - child->borderAndPaddingLogicalHeight();
175 } 175 }
176 176
177 void RenderDeprecatedFlexibleBox::styleWillChange(StyleDifference diff, const La youtStyle& newStyle) 177 void RenderDeprecatedFlexibleBox::styleWillChange(StyleDifference diff, const La youtStyle& newStyle)
178 { 178 {
179 LayoutStyle* oldStyle = style(); 179 const LayoutStyle* oldStyle = style();
180 if (oldStyle && !oldStyle->lineClamp().isNone() && newStyle.lineClamp().isNo ne()) 180 if (oldStyle && !oldStyle->lineClamp().isNone() && newStyle.lineClamp().isNo ne())
181 clearLineClamp(); 181 clearLineClamp();
182 182
183 RenderBlock::styleWillChange(diff, newStyle); 183 RenderBlock::styleWillChange(diff, newStyle);
184 } 184 }
185 185
186 void RenderDeprecatedFlexibleBox::computeIntrinsicLogicalWidths(LayoutUnit& minL ogicalWidth, LayoutUnit& maxLogicalWidth) const 186 void RenderDeprecatedFlexibleBox::computeIntrinsicLogicalWidths(LayoutUnit& minL ogicalWidth, LayoutUnit& maxLogicalWidth) const
187 { 187 {
188 if (hasMultipleLines() || isVertical()) { 188 if (hasMultipleLines() || isVertical()) {
189 for (RenderBox* child = firstChildBox(); child; child = child->nextSibli ngBox()) { 189 for (RenderBox* child = firstChildBox(); child; child = child->nextSibli ngBox()) {
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
1028 if (isOutOfFlowPositioned()) 1028 if (isOutOfFlowPositioned())
1029 return "RenderDeprecatedFlexibleBox (positioned)"; 1029 return "RenderDeprecatedFlexibleBox (positioned)";
1030 if (isAnonymous()) 1030 if (isAnonymous())
1031 return "RenderDeprecatedFlexibleBox (generated)"; 1031 return "RenderDeprecatedFlexibleBox (generated)";
1032 if (isRelPositioned()) 1032 if (isRelPositioned())
1033 return "RenderDeprecatedFlexibleBox (relative positioned)"; 1033 return "RenderDeprecatedFlexibleBox (relative positioned)";
1034 return "RenderDeprecatedFlexibleBox"; 1034 return "RenderDeprecatedFlexibleBox";
1035 } 1035 }
1036 1036
1037 } // namespace blink 1037 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderCombineText.cpp ('k') | Source/core/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698