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

27
mozilla/layout/base/nsCaret.cpp
View File

@@ -343,17 +343,10 @@ NS_IMETHODIMP nsCaret::GetCaretCoordinates(EViewCoordinates aRelativeToType, nsI
if (NS_FAILED(err))
return err;
// ... then get a device context
nsCOMPtr<nsIDeviceContext> dx;
err = presContext->GetDeviceContext(getter_AddRefs(dx));
if (NS_FAILED(err))
return err;
if (!dx)
return NS_ERROR_UNEXPECTED;
// ... then tell it to make a rendering context
nsCOMPtr<nsIRenderingContext> rendContext;
err = dx->CreateRenderingContext(drawingView, *getter_AddRefs(rendContext));
err = presContext->DeviceContext()->
CreateRenderingContext(drawingView, *getter_AddRefs(rendContext));
if (NS_FAILED(err))
return err;
if (!rendContext)
@@ -984,11 +977,10 @@ void nsCaret::GetCaretRectAndInvert()
{
mRendContext = nsnull; // free existing one if we have one
nsCOMPtr<nsIDeviceContext> dx;
if (NS_FAILED(presContext->GetDeviceContext(getter_AddRefs(dx))) || !dx)
return;
if (NS_FAILED(dx->CreateRenderingContext(drawingView, *getter_AddRefs(mRendContext))) || !mRendContext)
nsresult rv = presContext->DeviceContext()->
CreateRenderingContext(drawingView, *getter_AddRefs(mRendContext));
if (NS_FAILED(rv) || !mRendContext)
return;
}
@@ -1037,11 +1029,8 @@ void nsCaret::GetCaretRectAndInvert()
if (mCaretTwipsWidth < 0) // need to re-compute the pixel width
{
float tDevUnitsToTwips = 15;
nsCOMPtr<nsIDeviceContext> dx;
presContext->GetDeviceContext(getter_AddRefs(dx));
if (dx)
dx->GetDevUnitsToTwips(tDevUnitsToTwips);
float tDevUnitsToTwips;
presContext->DeviceContext()->GetDevUnitsToTwips(tDevUnitsToTwips);
mCaretTwipsWidth = (nscoord)(tDevUnitsToTwips * (float)mCaretPixelsWidth);
}
caretRect.width = mCaretTwipsWidth;