Merge 89183 - 2011-06-17 Julien Chaffraix <jchaffraix@webkit.org>

Source/WebCore/rendering/svg/SVGRootInlineBox.cpp

 /*
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  * Copyright (C) 2006 Apple Computer Inc.
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2011 Torch Mobile (Beijing) CO. Ltd. All rights reserved.
  *
  * 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 59 matching lines @@
 
     SVGRenderSupport::finishRenderSVGContent(boxRenderer, childPaintInfo, paintInfo.context);
 }
 
 void SVGRootInlineBox::computePerCharacterLayoutInformation()
 {
     RenderSVGText* parentBlock = toRenderSVGText(block());
     ASSERT(parentBlock);
 
     Vector<SVGTextLayoutAttributes>& attributes = parentBlock->layoutAttributes();
+    if (attributes.isEmpty())
+        return;
+
     if (parentBlock->needsReordering())
         reorderValueLists(attributes);
 
     // Perform SVG text layout phase two (see SVGTextLayoutEngine for details).
     SVGTextLayoutEngine characterLayout(attributes);
     layoutCharactersInTextBoxes(this, characterLayout);
 
     // Perform SVG text layout phase three (see SVGTextChunkBuilder for details).
     characterLayout.finishLayout();
 
@@ skipping 218 matching lines @@
 
 void SVGRootInlineBox::reorderValueLists(Vector<SVGTextLayoutAttributes>& attributes)
 {
     Vector<InlineBox*> leafBoxesInLogicalOrder;
     collectLeafBoxesInLogicalOrder(leafBoxesInLogicalOrder, reverseInlineBoxRangeAndValueListsIfNeeded, &attributes);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(SVG)