diff options
author | Steve Block <steveblock@google.com> | 2010-05-12 09:10:11 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-12 09:10:11 -0700 |
commit | d825659fd718f862a178e060693b359ae344e748 (patch) | |
tree | 86deb87a125c0533367245ab7fba4f5efaa2c72c | |
parent | 6aeb21a3c6e282b7243b1aea6f7b8305fcc5ec9e (diff) | |
parent | 3c81bbf75a3efd5f5ac8c7696a0c23c47ce15aa0 (diff) | |
download | external_webkit-d825659fd718f862a178e060693b359ae344e748.zip external_webkit-d825659fd718f862a178e060693b359ae344e748.tar.gz external_webkit-d825659fd718f862a178e060693b359ae344e748.tar.bz2 |
Merge "No longer consider a semi-colon to be a separator character when parsing the meta-tag"
-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++; } |