Merge 75026 - Merge 74788

WebCore/svg/SVGLength.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 74 matching lines @@
     ASSERT_NOT_REACHED();
     return String();
 }
 
 inline SVGLengthType stringToLengthType(const UChar*& ptr, const UChar* end)
 {
     if (ptr == end)
         return LengthTypeNumber;
 
     const UChar firstChar = *ptr;
-    ++ptr;
 
-    if (firstChar == '%') {
-        if (ptr == end)
-            return LengthTypePercentage;
-        return LengthTypeUnknown;
-    }
+    if (++ptr == end) 
+        return firstChar == '%' ? LengthTypePercentage : LengthTypeUnknown; 
 
     const UChar secondChar = *ptr;
 
     if (++ptr != end)
         return LengthTypeUnknown;
 
     if (firstChar == 'e' && secondChar == 'm')
         return LengthTypeEMS;
     if (firstChar == 'e' && secondChar == 'x')
         return LengthTypeEXS;
@@ skipping 444 matching lines @@
         cssType = CSSPrimitiveValue::CSS_PC;
         break;
     };
 
     return CSSPrimitiveValue::create(length.valueInSpecifiedUnits(), cssType);
 }
 
 }
 
 #endif