summaryrefslogtreecommitdiffstats
path: root/WebCore/svg/SVGLength.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-16 13:59:45 +0000
committerBen Murdoch <benm@google.com>2011-01-16 14:14:41 +0000
commit8a26975f9657a07318a10d481d7f332dad759325 (patch)
tree3d4270ff2d0aa27bdbb26e83c1de9d6ac18cb4fc /WebCore/svg/SVGLength.cpp
parente137c43847f22807f1276afc87027711cc3f4e77 (diff)
downloadexternal_webkit-8a26975f9657a07318a10d481d7f332dad759325.zip
external_webkit-8a26975f9657a07318a10d481d7f332dad759325.tar.gz
external_webkit-8a26975f9657a07318a10d481d7f332dad759325.tar.bz2
Merge WebKit at Chromium 9.0.597.69: Trivial merge by Git.
http://svn.webkit.org/repository/webkit/branches/chromium/597/WebCore@75681 Change-Id: Ibe552cf7af31f74b81e337eadf3d3b73a53daf60
Diffstat (limited to 'WebCore/svg/SVGLength.cpp')
-rw-r--r--WebCore/svg/SVGLength.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/WebCore/svg/SVGLength.cpp b/WebCore/svg/SVGLength.cpp
index 8168cf6..5377c7f 100644
--- a/WebCore/svg/SVGLength.cpp
+++ b/WebCore/svg/SVGLength.cpp
@@ -92,13 +92,9 @@ inline SVGLengthType stringToLengthType(const UChar*& ptr, const UChar* 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;