Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix "normal" and "-moz-initial" values for "content" to do the right thing.

Browse Source 
Bug 262624, r+sr=dbaron
This commit is contained in:
bzbarsky%mit.edu 2004-10-06 00:45:42 +00:00
parent ce63bee9d7
commit 8266fddc46
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/base/src/nsRuleNode.cpp
View File

@ -3917,11 +3917,14 @@ nsRuleNode::ComputeContentData(nsStyleStruct* aStartStruct,
parentContent = parentContext->GetStyleContent();
PRBool inherited = aInherited;
// content: [string, url, counter, attr, enum]+, inherit
// content: [string, url, counter, attr, enum]+, normal, inherit
PRUint32 count;
nsAutoString buffer;
nsCSSValueList* contentValue = contentData.mContent;
if (contentValue) {
// "normal" and "initial" both mean no content
if (contentValue &&
contentValue->mValue.GetUnit() != eCSSUnit_Normal &&
contentValue->mValue.GetUnit() != eCSSUnit_Initial) {
if (eCSSUnit_Inherit == contentValue->mValue.GetUnit()) {
inherited = PR_TRUE;
count = parentContent->ContentCount();

6
content/html/style/src/nsCSSParser.cpp
View File

@ -5149,7 +5149,8 @@ CSSParserImpl::DoParseRect(nsCSSRect& aRect, nsresult& aErrorCode)
PRBool CSSParserImpl::ParseContent(nsresult& aErrorCode)
{
nsCSSValue value;
if (ParseVariant(aErrorCode, value, VARIANT_CONTENT | VARIANT_INHERIT,
if (ParseVariant(aErrorCode, value,
VARIANT_CONTENT | VARIANT_INHERIT | VARIANT_NORMAL,
nsCSSProps::kContentKTable)) {
nsCSSValueList* listHead = new nsCSSValueList();
nsCSSValueList* list = listHead;
@ -5167,7 +5168,8 @@ PRBool CSSParserImpl::ParseContent(nsresult& aErrorCode)
return PR_TRUE;
}
if (eCSSUnit_Inherit == value.GetUnit() ||
eCSSUnit_Initial == value.GetUnit()) {
eCSSUnit_Initial == value.GetUnit() ||
eCSSUnit_Normal == value.GetUnit()) {
// This only matters the first time through the loop.
return PR_FALSE;
}

6
layout/style/nsCSSParser.cpp
View File

@ -5149,7 +5149,8 @@ CSSParserImpl::DoParseRect(nsCSSRect& aRect, nsresult& aErrorCode)
PRBool CSSParserImpl::ParseContent(nsresult& aErrorCode)
{
nsCSSValue value;
if (ParseVariant(aErrorCode, value, VARIANT_CONTENT | VARIANT_INHERIT,
if (ParseVariant(aErrorCode, value,
VARIANT_CONTENT | VARIANT_INHERIT | VARIANT_NORMAL,
nsCSSProps::kContentKTable)) {
nsCSSValueList* listHead = new nsCSSValueList();
nsCSSValueList* list = listHead;
@ -5167,7 +5168,8 @@ PRBool CSSParserImpl::ParseContent(nsresult& aErrorCode)
return PR_TRUE;
}
if (eCSSUnit_Inherit == value.GetUnit() ||
eCSSUnit_Initial == value.GetUnit()) {
eCSSUnit_Initial == value.GetUnit() ||
eCSSUnit_Normal == value.GetUnit()) {
// This only matters the first time through the loop.
return PR_FALSE;
}

7
layout/style/nsRuleNode.cpp
View File

@ -3917,11 +3917,14 @@ nsRuleNode::ComputeContentData(nsStyleStruct* aStartStruct,
parentContent = parentContext->GetStyleContent();
PRBool inherited = aInherited;
// content: [string, url, counter, attr, enum]+, inherit
// content: [string, url, counter, attr, enum]+, normal, inherit
PRUint32 count;
nsAutoString buffer;
nsCSSValueList* contentValue = contentData.mContent;
if (contentValue) {
// "normal" and "initial" both mean no content
if (contentValue &&
contentValue->mValue.GetUnit() != eCSSUnit_Normal &&
contentValue->mValue.GetUnit() != eCSSUnit_Initial) {
if (eCSSUnit_Inherit == contentValue->mValue.GetUnit()) {
inherited = PR_TRUE;
count = parentContent->ContentCount();