Merge 68408

WebCore/rendering/RenderListItem.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 227 matching lines @@
 void RenderListItem::layout()
 {
     ASSERT(needsLayout()); 
 
     updateMarkerLocation();    
     RenderBlock::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;
         for (RenderBox* o = m_marker->parentBox(); o != this; o = o->parentBox()) {
             yOffset += o->y();
             xOffset += o->x();
         }
 
         bool adjustOverflow = false;
         int markerXPos;
@@ skipping 125 matching lines @@
             }
 
             item->updateValue();
         }
 
         child = child->nextInPreOrder(list);
     }
 }
 
 } // namespace WebCore