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

decoupled style context resolution from frames

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@14004 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterl%netscape.com
1998-11-03 20:20:07 +00:00
parent 2565f0ea42
commit 5b7224a0ba
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/layout/base/nsPresContext.cpp
View File

@@ -219,14 +219,14 @@ nsPresContext::GetBaseURL(nsIURL*& aURL)
nsIStyleContext*
nsPresContext::ResolveStyleContextFor(nsIContent* aContent,
nsIFrame* aParentFrame,
nsIStyleContext* aParentContext,
PRBool aForceUnique)
{
nsIStyleContext* result = nsnull;
nsIStyleSet* set = mShell->GetStyleSet();
if (nsnull != set) {
result = set->ResolveStyleFor(this, aContent, aParentFrame, aForceUnique);
result = set->ResolveStyleFor(this, aContent, aParentContext, aForceUnique);
NS_RELEASE(set);
}
@@ -234,15 +234,16 @@ nsPresContext::ResolveStyleContextFor(nsIContent* aContent,
}
nsIStyleContext*
nsPresContext::ResolvePseudoStyleContextFor(nsIAtom* aPseudoTag,
nsIFrame* aParentFrame,
nsPresContext::ResolvePseudoStyleContextFor(nsIContent* aParentContent,
nsIAtom* aPseudoTag,
nsIStyleContext* aParentContext,
PRBool aForceUnique)
{
nsIStyleContext* result = nsnull;
nsIStyleSet* set = mShell->GetStyleSet();
if (nsnull != set) {
result = set->ResolvePseudoStyleFor(this, aPseudoTag, aParentFrame, aForceUnique);
result = set->ResolvePseudoStyleFor(this, aParentContent, aPseudoTag, aParentContext, aForceUnique);
NS_RELEASE(set);
}
@@ -250,15 +251,16 @@ nsPresContext::ResolvePseudoStyleContextFor(nsIAtom* aPseudoTag,
}
nsIStyleContext*
nsPresContext::ProbePseudoStyleContextFor(nsIAtom* aPseudoTag,
nsIFrame* aParentFrame,
nsPresContext::ProbePseudoStyleContextFor(nsIContent* aParentContent,
nsIAtom* aPseudoTag,
nsIStyleContext* aParentContext,
PRBool aForceUnique)
{
nsIStyleContext* result = nsnull;
nsIStyleSet* set = mShell->GetStyleSet();
if (nsnull != set) {
result = set->ProbePseudoStyleFor(this, aPseudoTag, aParentFrame, aForceUnique);
result = set->ProbePseudoStyleFor(this, aParentContent, aPseudoTag, aParentContext, aForceUnique);
NS_RELEASE(set);
}

18
mozilla/layout/base/src/nsPresContext.cpp
View File

@@ -219,14 +219,14 @@ nsPresContext::GetBaseURL(nsIURL*& aURL)
nsIStyleContext*
nsPresContext::ResolveStyleContextFor(nsIContent* aContent,
nsIFrame* aParentFrame,
nsIStyleContext* aParentContext,
PRBool aForceUnique)
{
nsIStyleContext* result = nsnull;
nsIStyleSet* set = mShell->GetStyleSet();
if (nsnull != set) {
result = set->ResolveStyleFor(this, aContent, aParentFrame, aForceUnique);
result = set->ResolveStyleFor(this, aContent, aParentContext, aForceUnique);
NS_RELEASE(set);
}
@@ -234,15 +234,16 @@ nsPresContext::ResolveStyleContextFor(nsIContent* aContent,
}
nsIStyleContext*
nsPresContext::ResolvePseudoStyleContextFor(nsIAtom* aPseudoTag,
nsIFrame* aParentFrame,
nsPresContext::ResolvePseudoStyleContextFor(nsIContent* aParentContent,
nsIAtom* aPseudoTag,
nsIStyleContext* aParentContext,
PRBool aForceUnique)
{
nsIStyleContext* result = nsnull;
nsIStyleSet* set = mShell->GetStyleSet();
if (nsnull != set) {
result = set->ResolvePseudoStyleFor(this, aPseudoTag, aParentFrame, aForceUnique);
result = set->ResolvePseudoStyleFor(this, aParentContent, aPseudoTag, aParentContext, aForceUnique);
NS_RELEASE(set);
}
@@ -250,15 +251,16 @@ nsPresContext::ResolvePseudoStyleContextFor(nsIAtom* aPseudoTag,
}
nsIStyleContext*
nsPresContext::ProbePseudoStyleContextFor(nsIAtom* aPseudoTag,
nsIFrame* aParentFrame,
nsPresContext::ProbePseudoStyleContextFor(nsIContent* aParentContent,
nsIAtom* aPseudoTag,
nsIStyleContext* aParentContext,
PRBool aForceUnique)
{
nsIStyleContext* result = nsnull;
nsIStyleSet* set = mShell->GetStyleSet();
if (nsnull != set) {
result = set->ProbePseudoStyleFor(this, aPseudoTag, aParentFrame, aForceUnique);
result = set->ProbePseudoStyleFor(this, aParentContent, aPseudoTag, aParentContext, aForceUnique);
NS_RELEASE(set);
}

12
mozilla/layout/base/src/nsPresContext.h
View File

@@ -39,13 +39,15 @@ public:
NS_IMETHOD SetCompatibilityMode(nsCompatibility aMode);
NS_IMETHOD GetBaseURL(nsIURL*& aURL);
virtual nsIStyleContext* ResolveStyleContextFor(nsIContent* aContent,
nsIFrame* aParentFrame,
nsIStyleContext* aParentContext,
PRBool aForceUnique = PR_FALSE);
virtual nsIStyleContext* ResolvePseudoStyleContextFor(nsIAtom* aPseudoTag,
nsIFrame* aParentFrame,
virtual nsIStyleContext* ResolvePseudoStyleContextFor(nsIContent* aParentContent,
nsIAtom* aPseudoTag,
nsIStyleContext* aParentContext,
PRBool aForceUnique = PR_FALSE);
virtual nsIStyleContext* ProbePseudoStyleContextFor(nsIAtom* aPseudoTag,
nsIFrame* aParentFrame,
virtual nsIStyleContext* ProbePseudoStyleContextFor(nsIContent* aParentContent,
nsIAtom* aPseudoTag,
nsIStyleContext* aParentContext,
PRBool aForceUnique = PR_FALSE);
virtual nsIFontMetrics* GetMetricsFor(const nsFont& aFont);
virtual const nsFont& GetDefaultFont(void);