Merge 68408

WebCore/rendering/RenderListMarker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
  *
  * 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
@@ skipping 1256 matching lines @@
         TextRun spaceSuffixRun(spaceSuffix, 2);
         int width = font.width(spaceSuffixRun);
         context->drawText(style()->font(), spaceSuffixRun, marker.location());
         context->drawText(style()->font(), textRun, marker.location() + IntSize(width, 0));
     }
 }
 
 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());
     } else {
         setWidth(minPrefWidth());
         setHeight(style()->font().height());
     }
 
     m_marginLeft = m_marginRight = 0;
@@ skipping 369 matching lines @@
             
     if (clipToVisibleContent)
         computeRectForRepaint(repaintContainer, rect);
     else
         rect = localToContainerQuad(FloatRect(rect), repaintContainer).enclosingBoundingBox();
     
     return rect;
 }
 
 } // namespace WebCore