Merge WebKit at r71558: Initial merge by git.

Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c

1 files changed, 4 insertions, 10 deletions

diff --git a/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp b/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
index 2474a5c..3122912 100644
--- a/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
+++ b/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
@@ -72,21 +72,15 @@ static inline void extractFloatValuesFromSVGLengthList(SVGElement* lengthContext
     }
 }
 
-static inline void extractFloatValuesFromSVGNumberList(SVGNumberList* list, Vector<float>& floatValues, unsigned textContentLength)
+static inline void extractFloatValuesFromSVGNumberList(const SVGNumberList& list, Vector<float>& floatValues, unsigned textContentLength)
 {
-    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) {
-        float length = list->getItem(i, ec);
-        ASSERT(!ec);
-        floatValues.append(length);
-    }
+    for (unsigned i = 0; i < length; ++i)
+        floatValues.append(list.at(i));
 }
 
 void SVGTextLayoutAttributesBuilder::buildLayoutScope(LayoutScope& scope, RenderObject* renderer, unsigned textContentStart, unsigned textContentLength) const