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.
git-svn-id: svn://10.0.0.236/trunk@138129 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1091,8 +1091,7 @@ nsListControlFrame::Reflow(nsIPresContext* aPresContext,
|
||||
mPresContext->GetShell(getter_AddRefs(presShell));
|
||||
nsresult result = presShell->GetPrimaryFrameFor(option, &optFrame);
|
||||
if (NS_SUCCEEDED(result) && optFrame != nsnull) {
|
||||
nsCOMPtr<nsIStyleContext> optStyle;
|
||||
optFrame->GetStyleContext(getter_AddRefs(optStyle));
|
||||
nsStyleContext* optStyle = optFrame->GetStyleContext();
|
||||
if (optStyle) {
|
||||
const nsStyleFont* styleFont = (const nsStyleFont*)optStyle->GetStyleData(eStyleStruct_Font);
|
||||
nsCOMPtr<nsIDeviceContext> deviceContext;
|
||||
@@ -1751,7 +1750,7 @@ NS_IMETHODIMP
|
||||
nsListControlFrame::Init(nsIPresContext* aPresContext,
|
||||
nsIContent* aContent,
|
||||
nsIFrame* aParent,
|
||||
nsIStyleContext* aContext,
|
||||
nsStyleContext* aContext,
|
||||
nsIFrame* aPrevInFlow)
|
||||
{
|
||||
mPresContext = aPresContext;
|
||||
|
||||
Reference in New Issue
Block a user