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 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1314 context->drawText(font, suffixRunInfo, textOrigin); | 1314 context->drawText(font, suffixRunInfo, textOrigin); |
1315 context->drawText(font, textRunPaintInfo, textOrigin + IntSize(font.
width(suffixRun), 0)); | 1315 context->drawText(font, textRunPaintInfo, textOrigin + IntSize(font.
width(suffixRun), 0)); |
1316 } | 1316 } |
1317 } | 1317 } |
1318 } | 1318 } |
1319 | 1319 |
1320 void RenderListMarker::layout() | 1320 void RenderListMarker::layout() |
1321 { | 1321 { |
1322 ASSERT(needsLayout()); | 1322 ASSERT(needsLayout()); |
1323 | 1323 |
| 1324 setMayNeedInvalidation(true); |
| 1325 |
1324 if (isImage()) { | 1326 if (isImage()) { |
1325 updateMarginsAndContent(); | 1327 updateMarginsAndContent(); |
1326 setWidth(m_image->imageSize(this, style()->effectiveZoom()).width()); | 1328 setWidth(m_image->imageSize(this, style()->effectiveZoom()).width()); |
1327 setHeight(m_image->imageSize(this, style()->effectiveZoom()).height()); | 1329 setHeight(m_image->imageSize(this, style()->effectiveZoom()).height()); |
1328 } else { | 1330 } else { |
1329 setLogicalWidth(minPreferredLogicalWidth()); | 1331 setLogicalWidth(minPreferredLogicalWidth()); |
1330 setLogicalHeight(style()->fontMetrics().height()); | 1332 setLogicalHeight(style()->fontMetrics().height()); |
1331 } | 1333 } |
1332 | 1334 |
1333 setMarginStart(0); | 1335 setMarginStart(0); |
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1839 | 1841 |
1840 if (clipToVisibleContent) | 1842 if (clipToVisibleContent) |
1841 computeRectForRepaint(repaintContainer, rect); | 1843 computeRectForRepaint(repaintContainer, rect); |
1842 else | 1844 else |
1843 rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosing
BoundingBox(); | 1845 rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosing
BoundingBox(); |
1844 | 1846 |
1845 return rect; | 1847 return rect; |
1846 } | 1848 } |
1847 | 1849 |
1848 } // namespace WebCore | 1850 } // namespace WebCore |
OLD | NEW |