Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added default argument to FindNonTransparentBackground to tell it to start at the context's parent (for QuirkMode emulation). r=karnaze b=8524

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@60396 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
attinasi%netscape.com
2000-02-11 01:24:05 +00:00
parent 30f1afd12d
commit f66be91ae7
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/content/html/style/src/nsStyleUtil.cpp
View File

@@ -185,11 +185,13 @@ nsStyleUtil::ConstrainFontWeight(PRInt32 aWeight)
}
const nsStyleColor* nsStyleUtil::FindNonTransparentBackground(nsIStyleContext* aContext)
const nsStyleColor* nsStyleUtil::FindNonTransparentBackground(nsIStyleContext* aContext,
PRBool aStartAtParent /*= PR_FALSE*/)
{
const nsStyleColor* result = nsnull;
nsIStyleContext* context = aContext;
nsIStyleContext* context = aStartAtParent ? aContext->GetParent() : aContext;
NS_ASSERTION( context != nsnull, "Cannot find NonTransparentBackground in a null context" );
NS_IF_ADDREF(context); // balance ending release
while (nsnull != context) {
result = (const nsStyleColor*)context->GetStyleData(eStyleStruct_Color);

8
mozilla/content/shared/src/nsStyleUtil.cpp
View File

@@ -185,11 +185,13 @@ nsStyleUtil::ConstrainFontWeight(PRInt32 aWeight)
}
const nsStyleColor* nsStyleUtil::FindNonTransparentBackground(nsIStyleContext* aContext)
const nsStyleColor* nsStyleUtil::FindNonTransparentBackground(nsIStyleContext* aContext,
PRBool aStartAtParent /*= PR_FALSE*/)
{
const nsStyleColor* result = nsnull;
nsIStyleContext* context = aContext;
nsIStyleContext* context = aStartAtParent ? aContext->GetParent() : aContext;
NS_ASSERTION( context != nsnull, "Cannot find NonTransparentBackground in a null context" );
NS_IF_ADDREF(context); // balance ending release
while (nsnull != context) {
result = (const nsStyleColor*)context->GetStyleData(eStyleStruct_Color);

3
mozilla/layout/html/style/public/nsStyleUtil.h
View File

@@ -43,7 +43,8 @@ public:
static PRInt32 ConstrainFontWeight(PRInt32 aWeight);
static const nsStyleColor* FindNonTransparentBackground(nsIStyleContext* aContext);
static const nsStyleColor* FindNonTransparentBackground(nsIStyleContext* aContext,
PRBool aStartAtParent = PR_FALSE);
};

8
mozilla/layout/html/style/src/nsStyleUtil.cpp
View File

@@ -185,11 +185,13 @@ nsStyleUtil::ConstrainFontWeight(PRInt32 aWeight)
}
const nsStyleColor* nsStyleUtil::FindNonTransparentBackground(nsIStyleContext* aContext)
const nsStyleColor* nsStyleUtil::FindNonTransparentBackground(nsIStyleContext* aContext,
PRBool aStartAtParent /*= PR_FALSE*/)
{
const nsStyleColor* result = nsnull;
nsIStyleContext* context = aContext;
nsIStyleContext* context = aStartAtParent ? aContext->GetParent() : aContext;
NS_ASSERTION( context != nsnull, "Cannot find NonTransparentBackground in a null context" );
NS_IF_ADDREF(context); // balance ending release
while (nsnull != context) {
result = (const nsStyleColor*)context->GetStyleData(eStyleStruct_Color);

8
mozilla/layout/style/nsStyleUtil.cpp
View File

@@ -185,11 +185,13 @@ nsStyleUtil::ConstrainFontWeight(PRInt32 aWeight)
}
const nsStyleColor* nsStyleUtil::FindNonTransparentBackground(nsIStyleContext* aContext)
const nsStyleColor* nsStyleUtil::FindNonTransparentBackground(nsIStyleContext* aContext,
PRBool aStartAtParent /*= PR_FALSE*/)
{
const nsStyleColor* result = nsnull;
nsIStyleContext* context = aContext;
nsIStyleContext* context = aStartAtParent ? aContext->GetParent() : aContext;
NS_ASSERTION( context != nsnull, "Cannot find NonTransparentBackground in a null context" );
NS_IF_ADDREF(context); // balance ending release
while (nsnull != context) {
result = (const nsStyleColor*)context->GetStyleData(eStyleStruct_Color);