diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/html/parser/HTMLParserIdioms.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/html/parser/HTMLParserIdioms.cpp')
| -rw-r--r-- | WebCore/html/parser/HTMLParserIdioms.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/html/parser/HTMLParserIdioms.cpp b/WebCore/html/parser/HTMLParserIdioms.cpp index a558cf5..f093eb2 100644 --- a/WebCore/html/parser/HTMLParserIdioms.cpp +++ b/WebCore/html/parser/HTMLParserIdioms.cpp @@ -43,7 +43,7 @@ String stripLeadingAndTrailingHTMLSpaces(const String& string) } if (numLeadingSpaces == length) - return emptyAtom; + return string.isNull() ? string : emptyAtom.string(); unsigned numTrailingSpaces; for (numTrailingSpaces = 0; numTrailingSpaces < length; ++numTrailingSpaces) { @@ -53,7 +53,7 @@ String stripLeadingAndTrailingHTMLSpaces(const String& string) ASSERT(numLeadingSpaces + numTrailingSpaces < length); - return string.substring(numLeadingSpaces, length - numTrailingSpaces); + return string.substring(numLeadingSpaces, length - (numLeadingSpaces + numTrailingSpaces)); } String serializeForNumberType(double number) |