mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixing bug 188959, HIDDEN attribute on EMBED should hide, r=av, sr=kin, a=asa

This commit is contained in:
peterlubczynski%netscape.com 2003-01-28 21:59:28 +00:00
Родитель 485811cb37
Коммит 8f3f637744
2 изменённых файлов: 12 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
layout/generic/nsObjectFrame.cpp
Просмотреть файл

@ -1423,16 +1423,19 @@ nsObjectFrame::IsHidden(PRBool aCheckVisibilityStyle) const
// only <embed> tags support the HIDDEN attribute // only <embed> tags support the HIDDEN attribute
if (tag.get() == nsHTMLAtoms::embed) { if (tag.get() == nsHTMLAtoms::embed) {
nsAutoString hidden; nsAutoString hidden;
mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::hidden, hidden); nsresult result = mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::hidden, hidden);
// Yes, these are really the kooky ways that you could tell 4.x // Yes, these are really the kooky ways that you could tell 4.x
// not to hide the <embed> once you'd put the 'hidden' attribute // not to hide the <embed> once you'd put the 'hidden' attribute
// on the tag... // on the tag...
// these |NS_ConvertASCIItoUCS2|s can't be |NS_LITERAL_STRING|s until |EqualsIgnoreCase| get's fixed // these |NS_ConvertASCIItoUCS2|s can't be |NS_LITERAL_STRING|s until |EqualsIgnoreCase| get's fixed
if (!hidden.IsEmpty() && // HIDDEN w/ no attributes gets translated as we are hidden for compatibility
// w/ 4.x and IE so we don't create a non-painting widget in layout. See bug 188959.
if (NS_CONTENT_ATTR_NOT_THERE != result &&
(hidden.IsEmpty() ||
!hidden.Equals(NS_LITERAL_STRING("false"), nsCaseInsensitiveStringComparator()) && !hidden.Equals(NS_LITERAL_STRING("false"), nsCaseInsensitiveStringComparator()) &&
!hidden.Equals(NS_LITERAL_STRING("no"), nsCaseInsensitiveStringComparator()) && !hidden.Equals(NS_LITERAL_STRING("no"), nsCaseInsensitiveStringComparator()) &&
!hidden.Equals(NS_LITERAL_STRING("off"), nsCaseInsensitiveStringComparator())) { !hidden.Equals(NS_LITERAL_STRING("off"), nsCaseInsensitiveStringComparator()))) {
return PR_TRUE; return PR_TRUE;
} }
} }

9
layout/html/base/src/nsObjectFrame.cpp
Просмотреть файл

@ -1423,16 +1423,19 @@ nsObjectFrame::IsHidden(PRBool aCheckVisibilityStyle) const
// only <embed> tags support the HIDDEN attribute // only <embed> tags support the HIDDEN attribute
if (tag.get() == nsHTMLAtoms::embed) { if (tag.get() == nsHTMLAtoms::embed) {
nsAutoString hidden; nsAutoString hidden;
mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::hidden, hidden); nsresult result = mContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::hidden, hidden);
// Yes, these are really the kooky ways that you could tell 4.x // Yes, these are really the kooky ways that you could tell 4.x
// not to hide the <embed> once you'd put the 'hidden' attribute // not to hide the <embed> once you'd put the 'hidden' attribute
// on the tag... // on the tag...
// these |NS_ConvertASCIItoUCS2|s can't be |NS_LITERAL_STRING|s until |EqualsIgnoreCase| get's fixed // these |NS_ConvertASCIItoUCS2|s can't be |NS_LITERAL_STRING|s until |EqualsIgnoreCase| get's fixed
if (!hidden.IsEmpty() && // HIDDEN w/ no attributes gets translated as we are hidden for compatibility
// w/ 4.x and IE so we don't create a non-painting widget in layout. See bug 188959.
if (NS_CONTENT_ATTR_NOT_THERE != result &&
(hidden.IsEmpty() ||
!hidden.Equals(NS_LITERAL_STRING("false"), nsCaseInsensitiveStringComparator()) && !hidden.Equals(NS_LITERAL_STRING("false"), nsCaseInsensitiveStringComparator()) &&
!hidden.Equals(NS_LITERAL_STRING("no"), nsCaseInsensitiveStringComparator()) && !hidden.Equals(NS_LITERAL_STRING("no"), nsCaseInsensitiveStringComparator()) &&
!hidden.Equals(NS_LITERAL_STRING("off"), nsCaseInsensitiveStringComparator())) { !hidden.Equals(NS_LITERAL_STRING("off"), nsCaseInsensitiveStringComparator()))) {
return PR_TRUE; return PR_TRUE;
} }
} }