Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-23 21:17:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 572696 - Fennec should understand meta viewport with spaces. r=jst a=blocking-fennec

Browse Source
This commit is contained in:
Vivien Nicolas 2010-11-05 18:27:24 +01:00
parent 23abde6d1a
commit b0b7a039e2
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
content/base/src/nsContentUtils.cpp
View File

@ -4803,8 +4803,12 @@ static void ProcessViewportToken(nsIDocument *aDocument,
return;
/* Extract the key and value. */
const nsAString &key = Substring(tail, tip);
const nsAString &value = Substring(++tip, end);
const nsAString &key =
nsContentUtils::TrimWhitespace<nsCRT::IsAsciiSpace>(Substring(tail, tip),
PR_TRUE);
const nsAString &value =
nsContentUtils::TrimWhitespace<nsCRT::IsAsciiSpace>(Substring(++tip, end),
PR_TRUE);
/* Check for known keys. If we find a match, insert the appropriate
* information into the document header. */
@ -4823,7 +4827,9 @@ static void ProcessViewportToken(nsIDocument *aDocument,
aDocument->SetHeaderData(nsGkAtoms::viewport_user_scalable, value);
}
#define IS_SEPARATOR(c) ((c == ' ') || (c == ',') || (c == ';'))
#define IS_SEPARATOR(c) ((c == '=') || (c == ',') || (c == ';') || \
(c == '\t') || (c == '\n') || (c == '\r'))
/* static */
nsresult
nsContentUtils::ProcessViewportInfo(nsIDocument *aDocument,
@ -4839,12 +4845,12 @@ nsContentUtils::ProcessViewportInfo(nsIDocument *aDocument,
viewportInfo.EndReading(end);
/* Read the tip to the first non-separator character. */
while ((tip != end) && IS_SEPARATOR(*tip))
while ((tip != end) && (IS_SEPARATOR(*tip) || nsCRT::IsAsciiSpace(*tip)))
++tip;
/* Read through and find tokens separated by separators. */
while (tip != end) {
/* Synchronize tip and tail. */
tail = tip;
@ -4852,11 +4858,22 @@ nsContentUtils::ProcessViewportInfo(nsIDocument *aDocument,
while ((tip != end) && !IS_SEPARATOR(*tip))
++tip;
/* Allow white spaces that surround the '=' character */
if ((tip != end) && (*tip == '=')) {
++tip;
while ((tip != end) && nsCRT::IsAsciiSpace(*tip))
++tip;
while ((tip != end) && !(IS_SEPARATOR(*tip) || nsCRT::IsAsciiSpace(*tip)))
++tip;
}
/* Our token consists of the characters between tail and tip. */
ProcessViewportToken(aDocument, Substring(tail, tip));
/* Skip separators. */
while ((tip != end) && IS_SEPARATOR(*tip))
while ((tip != end) && (IS_SEPARATOR(*tip) || nsCRT::IsAsciiSpace(*tip)))
++tip;
}