| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 static EllipsisBoxMap* gEllipsisBoxMap = 0; | 46 static EllipsisBoxMap* gEllipsisBoxMap = 0; |
| 47 | 47 |
| 48 RootInlineBox::RootInlineBox(RenderBlock* block) | 48 RootInlineBox::RootInlineBox(RenderBlock* block) |
| 49 : InlineFlowBox(block) | 49 : InlineFlowBox(block) |
| 50 , m_lineBreakPos(0) | 50 , m_lineBreakPos(0) |
| 51 , m_lineBreakObj(0) | 51 , m_lineBreakObj(0) |
| 52 , m_lineTop(0) | 52 , m_lineTop(0) |
| 53 , m_lineBottom(0) | 53 , m_lineBottom(0) |
| 54 , m_lineTopWithLeading(0) | 54 , m_lineTopWithLeading(0) |
| 55 , m_lineBottomWithLeading(0) | 55 , m_lineBottomWithLeading(0) |
| 56 #if ENABLE(CSS3_TEXT) | |
| 57 , m_maxLogicalTop(0) | 56 , m_maxLogicalTop(0) |
| 58 #endif // CSS3_TEXT | |
| 59 { | 57 { |
| 60 setIsHorizontal(block->isHorizontalWritingMode()); | 58 setIsHorizontal(block->isHorizontalWritingMode()); |
| 61 } | 59 } |
| 62 | 60 |
| 63 | 61 |
| 64 void RootInlineBox::destroy(RenderArena* arena) | 62 void RootInlineBox::destroy(RenderArena* arena) |
| 65 { | 63 { |
| 66 detachEllipsisBox(arena); | 64 detachEllipsisBox(arena); |
| 67 InlineFlowBox::destroy(arena); | 65 InlineFlowBox::destroy(arena); |
| 68 } | 66 } |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 adjustBlockDirectionPosition(annotationsAdjustment); | 284 adjustBlockDirectionPosition(annotationsAdjustment); |
| 287 heightOfBlock += annotationsAdjustment; | 285 heightOfBlock += annotationsAdjustment; |
| 288 } | 286 } |
| 289 | 287 |
| 290 LayoutUnit gridSnapAdjustment = lineSnapAdjustment(); | 288 LayoutUnit gridSnapAdjustment = lineSnapAdjustment(); |
| 291 if (gridSnapAdjustment) { | 289 if (gridSnapAdjustment) { |
| 292 adjustBlockDirectionPosition(gridSnapAdjustment); | 290 adjustBlockDirectionPosition(gridSnapAdjustment); |
| 293 heightOfBlock += gridSnapAdjustment; | 291 heightOfBlock += gridSnapAdjustment; |
| 294 } | 292 } |
| 295 | 293 |
| 296 #if ENABLE(CSS3_TEXT) | |
| 297 m_maxLogicalTop = 0; | 294 m_maxLogicalTop = 0; |
| 298 computeMaxLogicalTop(m_maxLogicalTop); | 295 computeMaxLogicalTop(m_maxLogicalTop); |
| 299 #endif // CSS3_TEXT | |
| 300 | 296 |
| 301 return heightOfBlock + maxHeight; | 297 return heightOfBlock + maxHeight; |
| 302 } | 298 } |
| 303 | 299 |
| 304 LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const | 300 LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const |
| 305 { | 301 { |
| 306 LayoutUnit result = 0; | 302 LayoutUnit result = 0; |
| 307 | 303 |
| 308 if (!renderer()->style()->isFlippedLinesWritingMode()) { | 304 if (!renderer()->style()->isFlippedLinesWritingMode()) { |
| 309 // Annotations under the previous line may push us down. | 305 // Annotations under the previous line may push us down. |
| (...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 986 } | 982 } |
| 987 | 983 |
| 988 #ifndef NDEBUG | 984 #ifndef NDEBUG |
| 989 const char* RootInlineBox::boxName() const | 985 const char* RootInlineBox::boxName() const |
| 990 { | 986 { |
| 991 return "RootInlineBox"; | 987 return "RootInlineBox"; |
| 992 } | 988 } |
| 993 #endif | 989 #endif |
| 994 | 990 |
| 995 } // namespace WebCore | 991 } // namespace WebCore |
| OLD | NEW |