OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv
ed. | 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv
ed. |
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) | 6 * Copyright (C) 2010 Daniel Bates (dbates@intudata.com) |
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 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1267 TextRun spaceSuffixRun(spaceSuffix, 2); | 1267 TextRun spaceSuffixRun(spaceSuffix, 2); |
1268 int width = font.width(spaceSuffixRun); | 1268 int width = font.width(spaceSuffixRun); |
1269 context->drawText(style()->font(), spaceSuffixRun, marker.location()); | 1269 context->drawText(style()->font(), spaceSuffixRun, marker.location()); |
1270 context->drawText(style()->font(), textRun, marker.location() + IntSize(
width, 0)); | 1270 context->drawText(style()->font(), textRun, marker.location() + IntSize(
width, 0)); |
1271 } | 1271 } |
1272 } | 1272 } |
1273 | 1273 |
1274 void RenderListMarker::layout() | 1274 void RenderListMarker::layout() |
1275 { | 1275 { |
1276 ASSERT(needsLayout()); | 1276 ASSERT(needsLayout()); |
1277 ASSERT(!prefWidthsDirty()); | |
1278 | 1277 |
1279 if (isImage()) { | 1278 if (isImage()) { |
1280 setWidth(m_image->imageSize(this, style()->effectiveZoom()).width()); | 1279 setWidth(m_image->imageSize(this, style()->effectiveZoom()).width()); |
1281 setHeight(m_image->imageSize(this, style()->effectiveZoom()).height()); | 1280 setHeight(m_image->imageSize(this, style()->effectiveZoom()).height()); |
1282 } else { | 1281 } else { |
1283 setWidth(minPrefWidth()); | 1282 setWidth(minPrefWidth()); |
1284 setHeight(style()->font().height()); | 1283 setHeight(style()->font().height()); |
1285 } | 1284 } |
1286 | 1285 |
1287 m_marginLeft = m_marginRight = 0; | 1286 m_marginLeft = m_marginRight = 0; |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1657 | 1656 |
1658 if (clipToVisibleContent) | 1657 if (clipToVisibleContent) |
1659 computeRectForRepaint(repaintContainer, rect); | 1658 computeRectForRepaint(repaintContainer, rect); |
1660 else | 1659 else |
1661 rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosing
BoundingBox(); | 1660 rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosing
BoundingBox(); |
1662 | 1661 |
1663 return rect; | 1662 return rect; |
1664 } | 1663 } |
1665 | 1664 |
1666 } // namespace WebCore | 1665 } // namespace WebCore |
OLD | NEW |