| 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 |
| 11 * version 2 of the License, or (at your option) any later version. | 11 * version 2 of the License, or (at your option) any later version. |
| 12 * | 12 * |
| 13 * This library is distributed in the hope that it will be useful, | 13 * This library is distributed in the hope that it will be useful, |
| 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 * Library General Public License for more details. | 16 * Library General Public License for more details. |
| 17 * | 17 * |
| 18 * You should have received a copy of the GNU Library General Public License | 18 * You should have received a copy of the GNU Library General Public License |
| 19 * along with this library; see the file COPYING.LIB. If not, write to | 19 * along with this library; see the file COPYING.LIB. If not, write to |
| 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 21 * Boston, MA 02110-1301, USA. | 21 * Boston, MA 02110-1301, USA. |
| 22 * | 22 * |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #include "config.h" | 25 #include "config.h" |
| 26 #include "core/rendering/RenderDeprecatedFlexibleBox.h" | 26 #include "core/rendering/RenderDeprecatedFlexibleBox.h" |
| 27 | 27 |
| 28 #include "core/frame/UseCounter.h" | 28 #include "core/frame/UseCounter.h" |
| 29 #include "core/rendering/FastTextAutosizer.h" |
| 29 #include "core/rendering/LayoutRepainter.h" | 30 #include "core/rendering/LayoutRepainter.h" |
| 30 #include "core/rendering/RenderLayer.h" | 31 #include "core/rendering/RenderLayer.h" |
| 31 #include "core/rendering/RenderView.h" | 32 #include "core/rendering/RenderView.h" |
| 32 #include "platform/fonts/Font.h" | 33 #include "platform/fonts/Font.h" |
| 33 #include "wtf/StdLibExtras.h" | 34 #include "wtf/StdLibExtras.h" |
| 34 #include "wtf/unicode/CharacterNames.h" | 35 #include "wtf/unicode/CharacterNames.h" |
| 35 | 36 |
| 36 using namespace std; | 37 using namespace std; |
| 37 | 38 |
| 38 namespace WebCore { | 39 namespace WebCore { |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 | 264 |
| 264 { | 265 { |
| 265 // LayoutStateMaintainer needs this deliberate scope to pop before repai
nt | 266 // LayoutStateMaintainer needs this deliberate scope to pop before repai
nt |
| 266 LayoutStateMaintainer statePusher(*this, locationOffset()); | 267 LayoutStateMaintainer statePusher(*this, locationOffset()); |
| 267 | 268 |
| 268 LayoutSize previousSize = size(); | 269 LayoutSize previousSize = size(); |
| 269 | 270 |
| 270 updateLogicalWidth(); | 271 updateLogicalWidth(); |
| 271 updateLogicalHeight(); | 272 updateLogicalHeight(); |
| 272 | 273 |
| 274 FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this); |
| 275 |
| 273 if (previousSize != size() | 276 if (previousSize != size() |
| 274 || (parent()->isDeprecatedFlexibleBox() && parent()->style()->boxOri
ent() == HORIZONTAL | 277 || (parent()->isDeprecatedFlexibleBox() && parent()->style()->boxOri
ent() == HORIZONTAL |
| 275 && parent()->style()->boxAlign() == BSTRETCH)) | 278 && parent()->style()->boxAlign() == BSTRETCH)) |
| 276 relayoutChildren = true; | 279 relayoutChildren = true; |
| 277 | 280 |
| 278 setHeight(0); | 281 setHeight(0); |
| 279 | 282 |
| 280 m_stretchingChildren = false; | 283 m_stretchingChildren = false; |
| 281 | 284 |
| 282 if (isHorizontal()) | 285 if (isHorizontal()) |
| (...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1081 if (isPseudoElement()) | 1084 if (isPseudoElement()) |
| 1082 return "RenderDeprecatedFlexibleBox (generated)"; | 1085 return "RenderDeprecatedFlexibleBox (generated)"; |
| 1083 if (isAnonymous()) | 1086 if (isAnonymous()) |
| 1084 return "RenderDeprecatedFlexibleBox (generated)"; | 1087 return "RenderDeprecatedFlexibleBox (generated)"; |
| 1085 if (isRelPositioned()) | 1088 if (isRelPositioned()) |
| 1086 return "RenderDeprecatedFlexibleBox (relative positioned)"; | 1089 return "RenderDeprecatedFlexibleBox (relative positioned)"; |
| 1087 return "RenderDeprecatedFlexibleBox"; | 1090 return "RenderDeprecatedFlexibleBox"; |
| 1088 } | 1091 } |
| 1089 | 1092 |
| 1090 } // namespace WebCore | 1093 } // namespace WebCore |
| OLD | NEW |