From 149f8f7ffc83d851bd6b33c8cfc8d8521fc0ff3a Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Thu, 24 Jan 2002 04:22:59 +0000 Subject: [PATCH] computed list-style-image should be "none" if there is no image. Bug 120719, r=hixie, sr=attinasi --- content/html/style/src/nsComputedDOMStyle.cpp | 8 ++++++-- layout/style/nsComputedDOMStyle.cpp | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/content/html/style/src/nsComputedDOMStyle.cpp b/content/html/style/src/nsComputedDOMStyle.cpp index ca8edb030d6f..457b5b848297 100644 --- a/content/html/style/src/nsComputedDOMStyle.cpp +++ b/content/html/style/src/nsComputedDOMStyle.cpp @@ -1490,10 +1490,14 @@ nsComputedDOMStyle::GetListStyleImage(nsIFrame *aFrame, GetStyleData(eStyleStruct_List, (const nsStyleStruct*&)list, aFrame); if(list) { - val->SetString(list->mListStyleImage); + if (list->mListStyleImage.IsEmpty()) { + val->SetString(NS_LITERAL_STRING("none")); + } else { + val->SetString(list->mListStyleImage); + } } else { - val->SetString(NS_LITERAL_STRING("")); + val->SetString(NS_LITERAL_STRING("none")); } return val->QueryInterface(NS_GET_IID(nsIDOMCSSPrimitiveValue), diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index ca8edb030d6f..457b5b848297 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -1490,10 +1490,14 @@ nsComputedDOMStyle::GetListStyleImage(nsIFrame *aFrame, GetStyleData(eStyleStruct_List, (const nsStyleStruct*&)list, aFrame); if(list) { - val->SetString(list->mListStyleImage); + if (list->mListStyleImage.IsEmpty()) { + val->SetString(NS_LITERAL_STRING("none")); + } else { + val->SetString(list->mListStyleImage); + } } else { - val->SetString(NS_LITERAL_STRING("")); + val->SetString(NS_LITERAL_STRING("none")); } return val->QueryInterface(NS_GET_IID(nsIDOMCSSPrimitiveValue),