diff options
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderListItem.cpp | 2 | ||||
| -rw-r--r-- | WebCore/rendering/RenderListMarker.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderListItem.cpp b/WebCore/rendering/RenderListItem.cpp index 54a7dd2..c613cbe 100644 --- a/WebCore/rendering/RenderListItem.cpp +++ b/WebCore/rendering/RenderListItem.cpp @@ -253,7 +253,7 @@ void RenderListItem::layout() void RenderListItem::positionListMarker() { - if (m_marker && !m_marker->isInside() && m_marker->inlineBoxWrapper()) { + if (m_marker && m_marker->parent()->isBox() && !m_marker->isInside() && m_marker->inlineBoxWrapper()) { int markerOldX = m_marker->x(); int yOffset = 0; int xOffset = 0; diff --git a/WebCore/rendering/RenderListMarker.cpp b/WebCore/rendering/RenderListMarker.cpp index d0353ee..6ba6bf5 100644 --- a/WebCore/rendering/RenderListMarker.cpp +++ b/WebCore/rendering/RenderListMarker.cpp @@ -1138,8 +1138,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int tx, int ty) void RenderListMarker::layout() { ASSERT(needsLayout()); - ASSERT(!prefWidthsDirty()); - + if (isImage()) { setWidth(m_image->imageSize(this, style()->effectiveZoom()).width()); setHeight(m_image->imageSize(this, style()->effectiveZoom()).height()); |