Revert "Rewrite parseFrameSetListOfDimension to match HTML5"

Source/core/platform/Length.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller ( mueller@kde.org )
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 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
@@ skipping 55 matching lines @@
     unsigned doubleLength;
     splitLength(data, length, intLength, doubleLength);
 
     bool ok;
     int r = charactersToIntStrict(data, intLength, &ok);
     if (ok)
         return Length(r, Fixed);
     return Length(0, Fixed);
 }
 
+template<typename CharType>
+static Length parseFrameSetDimension(const CharType* data, unsigned length)
+{
+    if (!length)
+        return Length(1, Relative);
+
+    unsigned intLength;
+    unsigned doubleLength;
+    unsigned i = splitLength(data, length, intLength, doubleLength);
+
+    bool ok;
+    CharType next = (i < length) ? data[i] : ' ';
+    if (next == '%') {
+        // IE quirk: accept decimal fractions for percentages.
+        double r = charactersToDouble(data, doubleLength, &ok);
+        if (ok)
+            return Length(r, Percent);
+        return Length(1, Relative);
+    }
+    int r = charactersToIntStrict(data, intLength, &ok);
+    if (next == '*') {
+        if (ok)
+            return Length(r, Relative);
+        return Length(1, Relative);
+    }
+    if (ok)
+        return Length(r, Fixed);
+    return Length(0, Relative);
+}
+
 // FIXME: Per HTML5, this should follow the "rules for parsing a list of integers".
 Vector<Length> parseHTMLAreaElementCoords(const String& string)
 {
     unsigned length = string.length();
     StringBuffer<LChar> spacified(length);
     for (unsigned i = 0; i < length; i++) {
         UChar cc = string[i];
         if (cc > '9' || (cc < '0' && cc != '-' && cc != '.'))
             spacified[i] = ' ';
         else
@@ skipping 17 matching lines @@
         r[i++] = parseHTMLAreaCoordinate(str->characters8() + pos, pos2 - pos);
         pos = pos2 + 1;
     }
     r[i] = parseHTMLAreaCoordinate(str->characters8() + pos, str->length() - pos);
 
     ASSERT(i == len - 1);
 
     return r;
 }
 
+template<typename CharType>
+static Vector<Length> parseFrameSetListOfDimensionsInternal(StringImpl* str)
+{
+    unsigned len = str->count(',') + 1;
+    Vector<Length> r(len);
+
+    int i = 0;
+    unsigned pos = 0;
+    size_t pos2;
+
+    while ((pos2 = str->find(',', pos)) != notFound) {
+        r[i++] = parseFrameSetDimension(str->getCharacters<CharType>() + pos, pos2 - pos);
+        pos = pos2 + 1;
+    }
+
+    ASSERT(i == len - 1);
+
+    // IE Quirk: If the last comma is the last char skip it and reduce len by one.
+    if (str->length() - pos > 0)
+        r[i] = parseFrameSetDimension(str->getCharacters<CharType>() + pos, str->length() - pos);
+    else
+        r.shrink(r.size() - 1);
+
+    return r;
+}
+
+// FIXME: Per HTML5, this should "use the rules for parsing a list of dimensions".
+Vector<Length> parseFrameSetListOfDimensions(const String& string)
+{
+    RefPtr<StringImpl> str = string.impl()->simplifyWhiteSpace();
+    if (!str->length())
+        return Vector<Length>();
+    if (str->is8Bit())
+        return parseFrameSetListOfDimensionsInternal<LChar>(str.get());
+    return parseFrameSetListOfDimensionsInternal<UChar>(str.get());
+}
+
 class CalculationValueHandleMap {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     CalculationValueHandleMap()
         : m_index(1)
     {
     }
 
     int insert(PassRefPtr<CalculationValue> calcValue)
     {
@@ skipping 87 matching lines @@
     return isCalculated() && (calculationValue() == o.calculationValue() || *calculationValue() == *o.calculationValue());
 }
 
 struct SameSizeAsLength {
     int32_t value;
     int32_t metaData;
 };
 COMPILE_ASSERT(sizeof(Length) == sizeof(SameSizeAsLength), length_should_stay_small);
 
 } // namespace WebCore