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

Change nsIPresContext to nsPresContext globally, follow-up to bug 253470. rs=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@160184 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2004-07-31 23:15:21 +00:00
parent 119c0f1ddd
commit 865734bf2f
746 changed files with 8083 additions and 8810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -52,7 +52,7 @@
#include "nsHTMLAtoms.h"
#include "nsLayoutAtoms.h"
#include "nsIPresShell.h"
#include "nsIPresContext.h"
#include "nsPresContext.h"
#include "nsIHTMLContent.h"
#include "nsIDOMNode.h" // for Find
#include "nsIDOMNodeList.h"
@@ -407,7 +407,7 @@ nsHTMLDocument::GetAttrSheetType()
}
nsresult
nsHTMLDocument::CreateShell(nsIPresContext* aContext,
nsHTMLDocument::CreateShell(nsPresContext* aContext,
nsIViewManager* aViewManager,
nsStyleSet* aStyleSet,
nsIPresShell** aInstancePtrResult)
@@ -753,7 +753,7 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
nsCOMPtr<nsIDocumentCharsetInfo> dcInfo;
docShell->GetDocumentCharsetInfo(getter_AddRefs(dcInfo));
nsCOMPtr<nsIPresContext> cx;
nsCOMPtr<nsPresContext> cx;
docShell->GetPresContext(getter_AddRefs(cx));
if(cx){
mTexttype = GET_BIDI_OPTION_TEXTTYPE(cx->GetBidi());
@@ -1100,7 +1100,7 @@ nsHTMLDocument::SetCompatibilityMode(nsCompatibility aMode)
}
nsCOMPtr<nsIPresShell> shell = (nsIPresShell*)mPresShells.SafeElementAt(0);
if (shell) {
nsCOMPtr<nsIPresContext> pc;
nsCOMPtr<nsPresContext> pc;
shell->GetPresContext(getter_AddRefs(pc));
if (pc) {
pc->SetCompatibilityMode(mCompatMode);
@@ -2499,7 +2499,7 @@ nsHTMLDocument::GetPixelDimensions(nsIPresShell* aShell,
nsresult rv = aShell->GetPrimaryFrameFor(body, &frame);
if (NS_SUCCEEDED(rv) && frame) {
nsSize size;
nsCOMPtr<nsIPresContext> presContext;
nsCOMPtr<nsPresContext> presContext;
aShell->GetPresContext(getter_AddRefs(presContext));
nsIView* view = frame->GetView();
@@ -2524,7 +2524,7 @@ nsHTMLDocument::GetPixelDimensions(nsIPresShell* aShell,
}
// Convert from twips to pixels
nsCOMPtr<nsIPresContext> context;
nsCOMPtr<nsPresContext> context;
rv = aShell->GetPresContext(getter_AddRefs(context));
if (NS_SUCCEEDED(rv)) {
@@ -2795,7 +2795,7 @@ nsHTMLDocument::GetSelection(nsAString& aReturn)
return NS_OK;
}
nsCOMPtr<nsIPresContext> cx;
nsCOMPtr<nsPresContext> cx;
shell->GetPresContext(getter_AddRefs(cx));
NS_ENSURE_TRUE(cx, NS_OK);
@@ -3548,7 +3548,7 @@ nsHTMLDocument::SetDesignMode(const nsAString & aDesignMode)
nsCOMPtr<nsIPresShell> shell = (nsIPresShell*)mPresShells.SafeElementAt(0);
NS_ENSURE_TRUE(shell, NS_ERROR_FAILURE);
nsCOMPtr<nsIPresContext> cx;
nsCOMPtr<nsPresContext> cx;
shell->GetPresContext(getter_AddRefs(cx));
NS_ENSURE_TRUE(cx, NS_ERROR_FAILURE);

2
mozilla/content/html/document/src/nsHTMLDocument.h
View File

@@ -86,7 +86,7 @@ public:
virtual void ResetToURI(nsIURI* aURI, nsILoadGroup* aLoadGroup);
virtual nsStyleSet::sheetType GetAttrSheetType();
virtual nsresult CreateShell(nsIPresContext* aContext,
virtual nsresult CreateShell(nsPresContext* aContext,
nsIViewManager* aViewManager,
nsStyleSet* aStyleSet,
nsIPresShell** aInstancePtrResult);

4
mozilla/content/html/document/src/nsImageDocument.cpp
View File

@@ -53,7 +53,7 @@
#include "imgIContainer.h"
#include "imgIDecoderObserver.h"
#include "nsIPresShell.h"
#include "nsIPresContext.h"
#include "nsPresContext.h"
#include "nsStyleContext.h"
#include "nsAutoPtr.h"
#include "nsMediaDocument.h"
@@ -556,7 +556,7 @@ nsImageDocument::CheckOverflowing()
return NS_OK;
}
nsCOMPtr<nsIPresContext> context;
nsCOMPtr<nsPresContext> context;
shell->GetPresContext(getter_AddRefs(context));
nsRect visibleArea = context->GetVisibleArea();

4
mozilla/content/html/document/src/nsMediaDocument.cpp
View File

@@ -39,7 +39,7 @@
#include "nsMediaDocument.h"
#include "nsHTMLAtoms.h"
#include "nsRect.h"
#include "nsIPresContext.h"
#include "nsPresContext.h"
#include "nsIPresShell.h"
#include "nsIScrollable.h"
#include "nsIViewManager.h"
@@ -282,7 +282,7 @@ nsMediaDocument::StartLayout()
shell->BeginObservingDocument();
// Initial-reflow this time.
nsCOMPtr<nsIPresContext> context;
nsCOMPtr<nsPresContext> context;
shell->GetPresContext(getter_AddRefs(context));
nsRect visibleArea = context->GetVisibleArea();
shell->InitialReflow(visibleArea.width, visibleArea.height);