Difference between revisions of "User:Minooz/OSD600/FF/patch565031"
< User:Minooz | OSD600 | FF
(Created page with ' <source lang="java"> diff -r ec44e31cc46b layout/generic/nsImageMap.cpp --- a/layout/generic/nsImageMap.cpp Wed Mar 30 20:48:32 2011 -0400 +++ b/layout/generic/nsImageMap.cpp …') |
|||
| Line 1: | Line 1: | ||
| − | |||
| − | |||
<source lang="java"> | <source lang="java"> | ||
| − | + | diff -r e6b318aca788 layout/generic/nsImageMap.cpp | |
| − | diff -r | + | --- a/layout/generic/nsImageMap.cpp Wed Apr 06 17:38:21 2011 -0700 |
| − | --- a/layout/generic/nsImageMap.cpp Wed | + | +++ b/layout/generic/nsImageMap.cpp Sat Apr 09 20:50:51 2011 -0400 |
| − | +++ b/layout/generic/nsImageMap.cpp | + | @@ -112,12 +112,7 @@ |
| − | @@ - | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
inline PRBool | inline PRBool | ||
is_space(char c) | is_space(char c) | ||
| Line 17: | Line 9: | ||
- return (c == ' ' || | - return (c == ' ' || | ||
- c == '\f' || | - c == '\f' || | ||
| − | + return | + | - c == '\n' || |
| − | + | - c == '\r' || | |
| + | - c == '\t' || | ||
| + | - c == '\v'); | ||
| + | + return c == ' '; | ||
| + | } | ||
| + | |||
static void logMessage(nsIContent* aContent, | static void logMessage(nsIContent* aContent, | ||
| − | + | @@ -186,12 +181,17 @@ | |
| − | @@ - | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
* Skip to a separator | * Skip to a separator | ||
*/ | */ | ||
tptr = n_str; | tptr = n_str; | ||
- while (!is_space(*tptr) && *tptr != ',' && *tptr != '\0') | - while (!is_space(*tptr) && *tptr != ',' && *tptr != '\0') | ||
| − | + while (!is_space(*tptr) && *tptr != ',' && *tptr != ';' && *tptr != '\0') | + | + while (!is_space(*tptr) && *tptr != ',' && *tptr != ';' && *tptr != '\0') |
{ | { | ||
| − | + | tptr++; | |
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
} | } | ||
n_str = tptr; | n_str = tptr; | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
/* | /* | ||
* If no more entries, break out here | * If no more entries, break out here | ||
*/ | */ | ||
| − | + | @@ -205,7 +205,7 @@ | |
| − | + | * comma. | |
| − | + | */ | |
| − | + | has_comma = PR_FALSE; | |
| − | @@ - | + | - while (is_space(*tptr) || *tptr == ',') |
| − | + | + while (is_space(*tptr) || *tptr == ',' || *tptr == ';') | |
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | - | ||
| − | + | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
{ | { | ||
| − | * | + | if (*tptr == ',') |
| − | + | { | |
| − | |||
</source> | </source> | ||
Revision as of 19:52, 9 April 2011
diff -r e6b318aca788 layout/generic/nsImageMap.cpp
--- a/layout/generic/nsImageMap.cpp Wed Apr 06 17:38:21 2011 -0700
+++ b/layout/generic/nsImageMap.cpp Sat Apr 09 20:50:51 2011 -0400
@@ -112,12 +112,7 @@
inline PRBool
is_space(char c)
{
- return (c == ' ' ||
- c == '\f' ||
- c == '\n' ||
- c == '\r' ||
- c == '\t' ||
- c == '\v');
+ return c == ' ';
}
static void logMessage(nsIContent* aContent,
@@ -186,12 +181,17 @@
* Skip to a separator
*/
tptr = n_str;
- while (!is_space(*tptr) && *tptr != ',' && *tptr != '\0')
+ while (!is_space(*tptr) && *tptr != ',' && *tptr != ';' && *tptr != '\0')
{
tptr++;
}
n_str = tptr;
/*
* If no more entries, break out here
*/
@@ -205,7 +205,7 @@
* comma.
*/
has_comma = PR_FALSE;
- while (is_space(*tptr) || *tptr == ',')
+ while (is_space(*tptr) || *tptr == ',' || *tptr == ';')
{
if (*tptr == ',')
{