OLD | NEW |
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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 clearPreferredLogicalWidthsDirty(); | 252 clearPreferredLogicalWidthsDirty(); |
253 } | 253 } |
254 | 254 |
255 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) | 255 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) |
256 { | 256 { |
257 ASSERT(needsLayout()); | 257 ASSERT(needsLayout()); |
258 | 258 |
259 if (!relayoutChildren && simplifiedLayout()) | 259 if (!relayoutChildren && simplifiedLayout()) |
260 return; | 260 return; |
261 | 261 |
262 LayoutRepainter repainter(*this, checkForRepaintDuringLayout()); | 262 LayoutRepainter repainter(*this, checkForPaintInvalidationDuringLayout()); |
263 | 263 |
264 { | 264 { |
265 // LayoutStateMaintainer needs this deliberate scope to pop before repai
nt | 265 // LayoutStateMaintainer needs this deliberate scope to pop before repai
nt |
266 LayoutStateMaintainer statePusher(*this, locationOffset()); | 266 LayoutStateMaintainer statePusher(*this, locationOffset()); |
267 | 267 |
268 LayoutSize previousSize = size(); | 268 LayoutSize previousSize = size(); |
269 | 269 |
270 updateLogicalWidth(); | 270 updateLogicalWidth(); |
271 updateLogicalHeight(); | 271 updateLogicalHeight(); |
272 | 272 |
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1001 | 1001 |
1002 // FIXME Investigate if this can be removed based on other flags. crbug.com/
370010 | 1002 // FIXME Investigate if this can be removed based on other flags. crbug.com/
370010 |
1003 child->setMayNeedPaintInvalidation(true); | 1003 child->setMayNeedPaintInvalidation(true); |
1004 | 1004 |
1005 // Place the child. | 1005 // Place the child. |
1006 child->setLocation(location); | 1006 child->setLocation(location); |
1007 | 1007 |
1008 // If the child moved, we have to repaint it as well as any floating/positio
ned | 1008 // If the child moved, we have to repaint it as well as any floating/positio
ned |
1009 // descendants. An exception is if we need a layout. In this case, we know
we're going to | 1009 // descendants. An exception is if we need a layout. In this case, we know
we're going to |
1010 // repaint ourselves (and the child) anyway. | 1010 // repaint ourselves (and the child) anyway. |
1011 if (!selfNeedsLayout() && child->checkForRepaintDuringLayout()) | 1011 if (!selfNeedsLayout() && child->checkForPaintInvalidationDuringLayout()) |
1012 child->repaintDuringLayoutIfMoved(oldRect); | 1012 child->repaintDuringLayoutIfMoved(oldRect); |
1013 } | 1013 } |
1014 | 1014 |
1015 LayoutUnit RenderDeprecatedFlexibleBox::allowedChildFlex(RenderBox* child, bool
expanding, unsigned int group) | 1015 LayoutUnit RenderDeprecatedFlexibleBox::allowedChildFlex(RenderBox* child, bool
expanding, unsigned int group) |
1016 { | 1016 { |
1017 if (childDoesNotAffectWidthOrFlexing(child) || child->style()->boxFlex() ==
0.0f || child->style()->boxFlexGroup() != group) | 1017 if (childDoesNotAffectWidthOrFlexing(child) || child->style()->boxFlex() ==
0.0f || child->style()->boxFlexGroup() != group) |
1018 return 0; | 1018 return 0; |
1019 | 1019 |
1020 if (expanding) { | 1020 if (expanding) { |
1021 if (isHorizontal()) { | 1021 if (isHorizontal()) { |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1081 if (isPseudoElement()) | 1081 if (isPseudoElement()) |
1082 return "RenderDeprecatedFlexibleBox (generated)"; | 1082 return "RenderDeprecatedFlexibleBox (generated)"; |
1083 if (isAnonymous()) | 1083 if (isAnonymous()) |
1084 return "RenderDeprecatedFlexibleBox (generated)"; | 1084 return "RenderDeprecatedFlexibleBox (generated)"; |
1085 if (isRelPositioned()) | 1085 if (isRelPositioned()) |
1086 return "RenderDeprecatedFlexibleBox (relative positioned)"; | 1086 return "RenderDeprecatedFlexibleBox (relative positioned)"; |
1087 return "RenderDeprecatedFlexibleBox"; | 1087 return "RenderDeprecatedFlexibleBox"; |
1088 } | 1088 } |
1089 | 1089 |
1090 } // namespace WebCore | 1090 } // namespace WebCore |
OLD | NEW |