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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 | 283 |
284 LayoutUnit gridSnapAdjustment = lineSnapAdjustment(); | 284 LayoutUnit gridSnapAdjustment = lineSnapAdjustment(); |
285 if (gridSnapAdjustment) { | 285 if (gridSnapAdjustment) { |
286 adjustBlockDirectionPosition(gridSnapAdjustment); | 286 adjustBlockDirectionPosition(gridSnapAdjustment); |
287 heightOfBlock += gridSnapAdjustment; | 287 heightOfBlock += gridSnapAdjustment; |
288 } | 288 } |
289 | 289 |
290 return heightOfBlock + maxHeight; | 290 return heightOfBlock + maxHeight; |
291 } | 291 } |
292 | 292 |
293 #if ENABLE(CSS3_TEXT) | |
294 float RootInlineBox::maxLogicalTop() const | 293 float RootInlineBox::maxLogicalTop() const |
295 { | 294 { |
296 float maxLogicalTop = 0; | 295 float maxLogicalTop = 0; |
297 computeMaxLogicalTop(maxLogicalTop); | 296 computeMaxLogicalTop(maxLogicalTop); |
298 return maxLogicalTop; | 297 return maxLogicalTop; |
299 } | 298 } |
300 #endif // CSS3_TEXT | |
301 | 299 |
302 LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const | 300 LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const |
303 { | 301 { |
304 LayoutUnit result = 0; | 302 LayoutUnit result = 0; |
305 | 303 |
306 if (!renderer()->style()->isFlippedLinesWritingMode()) { | 304 if (!renderer()->style()->isFlippedLinesWritingMode()) { |
307 // Annotations under the previous line may push us down. | 305 // Annotations under the previous line may push us down. |
308 if (prevRootBox() && prevRootBox()->hasAnnotationsAfter()) | 306 if (prevRootBox() && prevRootBox()->hasAnnotationsAfter()) |
309 result = prevRootBox()->computeUnderAnnotationAdjustment(lineTop()); | 307 result = prevRootBox()->computeUnderAnnotationAdjustment(lineTop()); |
310 | 308 |
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
984 } | 982 } |
985 | 983 |
986 #ifndef NDEBUG | 984 #ifndef NDEBUG |
987 const char* RootInlineBox::boxName() const | 985 const char* RootInlineBox::boxName() const |
988 { | 986 { |
989 return "RootInlineBox"; | 987 return "RootInlineBox"; |
990 } | 988 } |
991 #endif | 989 #endif |
992 | 990 |
993 } // namespace WebCore | 991 } // namespace WebCore |
OLD | NEW |