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, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. |
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) | 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 void RenderListItem::layout() | 238 void RenderListItem::layout() |
239 { | 239 { |
240 ASSERT(needsLayout()); | 240 ASSERT(needsLayout()); |
241 | 241 |
242 updateMarkerLocation(); | 242 updateMarkerLocation(); |
243 RenderBlock::layout(); | 243 RenderBlock::layout(); |
244 } | 244 } |
245 | 245 |
246 void RenderListItem::positionListMarker() | 246 void RenderListItem::positionListMarker() |
247 { | 247 { |
248 if (m_marker && !m_marker->isInside() && m_marker->inlineBoxWrapper()) { | 248 if (m_marker && m_marker->parent()->isBox() && !m_marker->isInside() && m_ma
rker->inlineBoxWrapper()) { |
249 int markerOldX = m_marker->x(); | 249 int markerOldX = m_marker->x(); |
250 int yOffset = 0; | 250 int yOffset = 0; |
251 int xOffset = 0; | 251 int xOffset = 0; |
252 for (RenderBox* o = m_marker->parentBox(); o != this; o = o->parentBox()
) { | 252 for (RenderBox* o = m_marker->parentBox(); o != this; o = o->parentBox()
) { |
253 yOffset += o->y(); | 253 yOffset += o->y(); |
254 xOffset += o->x(); | 254 xOffset += o->x(); |
255 } | 255 } |
256 | 256 |
257 bool adjustOverflow = false; | 257 bool adjustOverflow = false; |
258 int markerXPos; | 258 int markerXPos; |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 } | 384 } |
385 | 385 |
386 item->updateValue(); | 386 item->updateValue(); |
387 } | 387 } |
388 | 388 |
389 child = child->nextInPreOrder(list); | 389 child = child->nextInPreOrder(list); |
390 } | 390 } |
391 } | 391 } |
392 | 392 |
393 } // namespace WebCore | 393 } // namespace WebCore |
OLD | NEW |