| 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 } | 245 } |
| 246 | 246 |
| 247 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) | 247 void RenderDeprecatedFlexibleBox::layoutBlock(bool relayoutChildren) |
| 248 { | 248 { |
| 249 ASSERT(needsLayout()); | 249 ASSERT(needsLayout()); |
| 250 | 250 |
| 251 if (!relayoutChildren && simplifiedLayout()) | 251 if (!relayoutChildren && simplifiedLayout()) |
| 252 return; | 252 return; |
| 253 | 253 |
| 254 { | 254 { |
| 255 // LayoutState needs this deliberate scope to pop before repaint | 255 // LayoutState needs this deliberate scope to pop before paint invalidat
ion. |
| 256 LayoutState state(*this, locationOffset()); | 256 LayoutState state(*this, locationOffset()); |
| 257 | 257 |
| 258 LayoutSize previousSize = size(); | 258 LayoutSize previousSize = size(); |
| 259 | 259 |
| 260 updateLogicalWidth(); | 260 updateLogicalWidth(); |
| 261 updateLogicalHeight(); | 261 updateLogicalHeight(); |
| 262 | 262 |
| 263 TextAutosizer::LayoutScope textAutosizerLayoutScope(this); | 263 TextAutosizer::LayoutScope textAutosizerLayoutScope(this); |
| 264 | 264 |
| 265 if (previousSize != size() | 265 if (previousSize != size() |
| (...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1062 if (isPseudoElement()) | 1062 if (isPseudoElement()) |
| 1063 return "RenderDeprecatedFlexibleBox (generated)"; | 1063 return "RenderDeprecatedFlexibleBox (generated)"; |
| 1064 if (isAnonymous()) | 1064 if (isAnonymous()) |
| 1065 return "RenderDeprecatedFlexibleBox (generated)"; | 1065 return "RenderDeprecatedFlexibleBox (generated)"; |
| 1066 if (isRelPositioned()) | 1066 if (isRelPositioned()) |
| 1067 return "RenderDeprecatedFlexibleBox (relative positioned)"; | 1067 return "RenderDeprecatedFlexibleBox (relative positioned)"; |
| 1068 return "RenderDeprecatedFlexibleBox"; | 1068 return "RenderDeprecatedFlexibleBox"; |
| 1069 } | 1069 } |
| 1070 | 1070 |
| 1071 } // namespace blink | 1071 } // namespace blink |
| OLD | NEW |