From e14391e94c850b8bd03680c23b38978db68687a8 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 4 Nov 2010 12:00:17 -0700
Subject: Merge Webkit at r70949: Initial merge by git.

Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
---
 WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp')

diff --git a/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp b/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
index c3f4b6a..2474a5c 100644
--- a/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
+++ b/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
@@ -57,20 +57,17 @@ void SVGTextLayoutAttributesBuilder::buildLayoutAttributesForTextSubtree(RenderS
     propagateLayoutAttributes(textRoot, atCharacter, lastCharacter);
 }
 
-static inline void extractFloatValuesFromSVGLengthList(SVGElement* lengthContext, SVGLengthList* list, Vector<float>& floatValues, unsigned textContentLength)
+static inline void extractFloatValuesFromSVGLengthList(SVGElement* lengthContext, const SVGLengthList& list, Vector<float>& floatValues, unsigned textContentLength)
 {
     ASSERT(lengthContext);
-    ASSERT(list);
 
-    unsigned length = list->numberOfItems();
+    unsigned length = list.size();
     if (length > textContentLength)
         length = textContentLength;
     floatValues.reserveCapacity(length);
 
-    ExceptionCode ec = 0;
     for (unsigned i = 0; i < length; ++i) {
-        SVGLength length = list->getItem(i, ec);
-        ASSERT(!ec);
+        const SVGLength& length = list.at(i);
         floatValues.append(length.value(lengthContext));
     }
 }
-- 
cgit v1.1