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

Guarantee that the pres context's device context will be non-null by returning failure from Init() if it's null. Rename inline getter GetDeviceContext() to DeviceContext(), convert all callers to use the inline getter, and remove the virtual/refcounting getter. Bug 229371, r+sr=dbaron.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@152182 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2004-02-02 22:17:21 +00:00
parent 1933a43e01
commit 5b5cd321a4
42 changed files with 544 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/layout/base/nsPresShell.cpp
View File

@@ -3909,17 +3909,13 @@ PresShell::CreateRenderingContext(nsIFrame *aFrame,
view->GetViewManager()->GetWidgetForView(view, getter_AddRefs(widget));
}
nsCOMPtr<nsIDeviceContext> dx;
nsIRenderingContext* result = nsnull;
rv = mPresContext->GetDeviceContext(getter_AddRefs(dx));
if (NS_SUCCEEDED(rv) && dx) {
if (nsnull != widget) {
rv = dx->CreateRenderingContext(widget.get(), result);
}
else {
rv = dx->CreateRenderingContext(result);
}
nsIDeviceContext *deviceContext = mPresContext->DeviceContext();
if (widget) {
rv = deviceContext->CreateRenderingContext(widget.get(), result);
}
else {
rv = deviceContext->CreateRenderingContext(result);
}
*aResult = result;
@@ -7032,8 +7028,7 @@ PresShell::VerifyIncrementalReflow()
}
NS_ASSERTION(NS_SUCCEEDED (rv), "failed to create presentation context");
nsCOMPtr<nsIDeviceContext> dc;
mPresContext->GetDeviceContext(getter_AddRefs(dc));
nsIDeviceContext *dc = mPresContext->DeviceContext();
rv = cx->Init(dc);
NS_ENSURE_SUCCESS(rv, rv);