| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 LayoutUnit lineBottom) const { | 349 LayoutUnit lineBottom) const { |
| 350 LayoutRect result = visualOverflowRect(lineTop, lineBottom); | 350 LayoutRect result = visualOverflowRect(lineTop, lineBottom); |
| 351 if (!getLineLayoutItem().isHorizontalWritingMode()) | 351 if (!getLineLayoutItem().isHorizontalWritingMode()) |
| 352 result = result.transposedRect(); | 352 result = result.transposedRect(); |
| 353 return result; | 353 return result; |
| 354 } | 354 } |
| 355 | 355 |
| 356 LayoutRect frameRectIncludingLineHeight(LayoutUnit lineTop, | 356 LayoutRect frameRectIncludingLineHeight(LayoutUnit lineTop, |
| 357 LayoutUnit lineBottom) const { | 357 LayoutUnit lineBottom) const { |
| 358 if (isHorizontal()) | 358 if (isHorizontal()) |
| 359 return LayoutRect(m_topLeft.x(), lineTop, width(), lineBottom - lineTop); | 359 return LayoutRect(x(), lineTop, logicalWidth(), lineBottom - lineTop); |
| 360 return LayoutRect(lineTop, m_topLeft.y(), lineBottom - lineTop, height()); | 360 return LayoutRect(lineTop, y(), lineBottom - lineTop, logicalWidth()); |
| 361 } | 361 } |
| 362 | 362 |
| 363 LayoutRect logicalFrameRectIncludingLineHeight(LayoutUnit lineTop, | 363 LayoutRect logicalFrameRectIncludingLineHeight(LayoutUnit lineTop, |
| 364 LayoutUnit lineBottom) const { | 364 LayoutUnit lineBottom) const { |
| 365 return LayoutRect(logicalLeft(), lineTop, logicalWidth(), | 365 return LayoutRect(logicalLeft(), lineTop, logicalWidth(), |
| 366 lineBottom - lineTop); | 366 lineBottom - lineTop); |
| 367 } | 367 } |
| 368 | 368 |
| 369 bool descendantsHaveSameLineHeightAndBaseline() const { | 369 bool descendantsHaveSameLineHeightAndBaseline() const { |
| 370 return m_descendantsHaveSameLineHeightAndBaseline; | 370 return m_descendantsHaveSameLineHeightAndBaseline; |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 | 488 |
| 489 inline void InlineFlowBox::setHasBadChildList() { | 489 inline void InlineFlowBox::setHasBadChildList() { |
| 490 #if ENABLE(ASSERT) | 490 #if ENABLE(ASSERT) |
| 491 m_hasBadChildList = true; | 491 m_hasBadChildList = true; |
| 492 #endif | 492 #endif |
| 493 } | 493 } |
| 494 | 494 |
| 495 } // namespace blink | 495 } // namespace blink |
| 496 | 496 |
| 497 #endif // InlineFlowBox_h | 497 #endif // InlineFlowBox_h |
| OLD | NEW |