diff options
author | Steve Block <steveblock@google.com> | 2010-05-12 16:30:10 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-05-12 16:30:10 +0100 |
commit | 3c81bbf75a3efd5f5ac8c7696a0c23c47ce15aa0 (patch) | |
tree | c8decc50c0c8b7388f3f8cf39a67459fbec877db /WebCore | |
parent | cae38efe66aa87d4dbcc096e0d59574e6f7122d7 (diff) | |
download | external_webkit-3c81bbf75a3efd5f5ac8c7696a0c23c47ce15aa0.zip external_webkit-3c81bbf75a3efd5f5ac8c7696a0c23c47ce15aa0.tar.gz external_webkit-3c81bbf75a3efd5f5ac8c7696a0c23c47ce15aa0.tar.bz2 |
No longer consider a semi-colon to be a separator character when parsing the meta-tag
The Android meta-tag parsing code was originally copied from the iPhone
implementation. A later change added the semi-colon to the list of separator
characters, motivated by Reader. See http://b/issue?id=1416841 and
https://mondrian.corp.google.com/changelist/115656-p9
Meta-tag support has since been added to WebKit in
http://trac.webkit.org/changeset/57775. The upstream parsing code does not
consider the semi-colon to be a separator. The upstream parsing code was merged
into Android as part of the merge to WebKit r58033 in
https://android-git.corp.google.com/g/#change,50648
This change removes the Android-specific changes so the semi-colon is no longer
considered a separator. This brings Android back into line with iPhone and other
browsers.
Change-Id: Id4cbbadb414d0508a89006d9beb91c56fa1f8daf
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/dom/Document.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index 0e1d31b..ffbfd24 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -2355,11 +2355,7 @@ void Document::processHttpEquiv(const String& equiv, const String& content) // Though isspace() considers \t and \v to be whitespace, Win IE doesn't. static bool isSeparator(UChar c) { -#ifdef ANDROID_META_SUPPORT - return c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '=' || c == ',' || c == ';' || c == '\0'; -#else return c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '=' || c == ',' || c == '\0'; -#endif } void Document::processArguments(const String& features, void* data, ArgumentsCallback callback) @@ -2387,22 +2383,14 @@ void Document::processArguments(const String& features, void* data, ArgumentsCal // skip to first '=', but don't skip past a ',' or the end of the string while (buffer[i] != '=') { -#ifdef ANDROID_META_SUPPORT - if (buffer[i] == ',' || buffer[i] == ';' || i >= length) -#else if (buffer[i] == ',' || i >= length) -#endif break; i++; } // skip to first non-separator, but don't skip past a ',' or the end of the string while (isSeparator(buffer[i])) { -#ifdef ANDROID_META_SUPPORT - if (buffer[i] == ',' || buffer[i] == ';' || i >= length) -#else if (buffer[i] == ',' || i >= length) -#endif break; i++; } |