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

Remove nsIStyleContext (bug 114713), r/sr=dbaron. Changed lots of methods to use nsStyleContext* or already_AddRefed<nsStyleContext> as return values, depending on whether a reference is returned. Turn on nsRefPtr (bug 104346), and change nsDerivedSafe to not declare AddRef and Release explicitly virtual, r=jag, sr=dbaron.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@138129 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%netscape.com
2003-02-22 00:32:13 +00:00
parent a1fd6aa5e3
commit c44337949a
311 changed files with 3728 additions and 4482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
View File

@@ -38,7 +38,7 @@
#include "nsIRenderingContext.h"
#include "nsIPresContext.h"
#include "nsIPresShell.h"
#include "nsIStyleContext.h"
#include "nsStyleContext.h"
#include "nsStyleConsts.h"
#include "nsIContent.h"
#include "nsLayoutAtoms.h"
@@ -188,10 +188,9 @@ nsHTMLContainerFrame::GetTextDecorations(nsIPresContext* aPresContext,
for (nsIFrame *frame = this; frame && decorMask; frame->GetParent(&frame)) {
// find text-decorations. "Inherit" from parent *block* frames
nsCOMPtr<nsIStyleContext> styleContext;
frame->GetStyleContext(getter_AddRefs(styleContext));
nsStyleContext* styleContext = frame->GetStyleContext();
const nsStyleDisplay* styleDisplay;
::GetStyleData(styleContext.get(), &styleDisplay);
::GetStyleData(styleContext, &styleDisplay);
if (!styleDisplay->IsBlockLevel() &&
styleDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL) {
// If an inline frame is discovered while walking up the tree,
@@ -200,12 +199,12 @@ nsHTMLContainerFrame::GetTextDecorations(nsIPresContext* aPresContext,
break;
}
::GetStyleData(styleContext.get(), &styleText);
::GetStyleData(styleContext, &styleText);
PRUint8 decors = decorMask & styleText->mTextDecoration;
if (decors) {
// A *new* text-decoration is found.
const nsStyleColor* styleColor;
::GetStyleData(styleContext.get(), &styleColor);
::GetStyleData(styleContext, &styleColor);
if (NS_STYLE_TEXT_DECORATION_UNDERLINE & decors) {
aUnderColor = styleColor->mColor;
@@ -605,7 +604,7 @@ nsHTMLContainerFrame::ReparentFrameViewList(nsIPresContext* aPresContext,
nsresult
nsHTMLContainerFrame::CreateViewForFrame(nsIPresContext* aPresContext,
nsIFrame* aFrame,
nsIStyleContext* aStyleContext,
nsStyleContext* aStyleContext,
nsIFrame* aContentParentFrame,
PRBool aForce)
{