Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-07 11:56:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for leakage of nsScreenWin object in embedding case. r=saari, sr=sfraser. bug# 43590.

Browse Source
This commit is contained in:
pinkerton%netscape.com 2001-01-23 00:39:40 +00:00
parent 2db94089e6
commit d6dfabce59
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gfx/src/mac/nsDeviceContextMac.cpp
View File

@ -407,17 +407,16 @@ NS_IMETHODIMP nsDeviceContextMac::GetDepth(PRUint32& aDepth)
// By always returning the bit depth of the primary screen, QD
// can do the proper color mappings.
static nsCOMPtr<nsIScreen> sPrimaryScreen;
if ( !sPrimaryScreen && mScreenManager )
mScreenManager->GetPrimaryScreen ( getter_AddRefs(sPrimaryScreen) );
if ( !mPrimaryScreen && mScreenManager )
mScreenManager->GetPrimaryScreen ( getter_AddRefs(mPrimaryScreen) );
if(!sPrimaryScreen) {
if(!mPrimaryScreen) {
aDepth = 1;
return NS_OK;
}
PRInt32 depth;
sPrimaryScreen->GetPixelDepth ( &depth );
mPrimaryScreen->GetPixelDepth ( &depth );
aDepth = NS_STATIC_CAST ( PRUint32, depth );
return NS_OK;
@ -500,11 +499,10 @@ void
nsDeviceContextMac :: FindScreenForSurface ( nsIScreen** outScreen )
{
// optimize for the case where we only have one monitor.
static nsCOMPtr<nsIScreen> sPrimaryScreen;
if ( !sPrimaryScreen && mScreenManager )
mScreenManager->GetPrimaryScreen ( getter_AddRefs(sPrimaryScreen) );
if ( !mPrimaryScreen && mScreenManager )
mScreenManager->GetPrimaryScreen ( getter_AddRefs(mPrimaryScreen) );
if ( sNumberOfScreens == 1 ) {
NS_IF_ADDREF(*outScreen = sPrimaryScreen.get());
NS_IF_ADDREF(*outScreen = mPrimaryScreen.get());
return;
}
@ -515,7 +513,7 @@ nsDeviceContextMac :: FindScreenForSurface ( nsIScreen** outScreen )
nsIWidget* widget = reinterpret_cast<nsIWidget*>(mWidget); // PRAY!
NS_ASSERTION ( widget, "No Widget --> No Window" );
if ( !widget ) {
NS_IF_ADDREF(*outScreen = sPrimaryScreen.get()); // bail out with the main screen just to be safe.
NS_IF_ADDREF(*outScreen = mPrimaryScreen.get()); // bail out with the main screen just to be safe.
return;
}
WindowRef window = reinterpret_cast<WindowRef>(widget->GetNativeData(NS_NATIVE_DISPLAY));
@ -526,7 +524,7 @@ nsDeviceContextMac :: FindScreenForSurface ( nsIScreen** outScreen )
if ( mScreenManager ) {
if ( !(bounds.top || bounds.left || bounds.bottom || bounds.right) ) {
NS_WARNING ( "trying to find screen for sizeless window" );
NS_IF_ADDREF(*outScreen = sPrimaryScreen.get());
NS_IF_ADDREF(*outScreen = mPrimaryScreen.get());
}
else {
::SetPortWindowPort( window );
@ -540,8 +538,6 @@ nsDeviceContextMac :: FindScreenForSurface ( nsIScreen** outScreen )
// subtract out the height of title bar from the size
StRegionFromPool structRgn;
// GetWindowRegion is available in 8.0 and beyond. Use it.
// ::GetWindowStructureRgn(window, structRgn);
::GetWindowRegion(window, kWindowStructureRgn, structRgn);
Rect structBox;
::GetRegionBounds ( structRgn, &structBox );

1
gfx/src/mac/nsDeviceContextMac.h
View File

@ -86,6 +86,7 @@ protected:
nsIDeviceContextSpec *mSpec;
GrafPtr mOldPort;
nsCOMPtr<nsIScreenManager> mScreenManager;
nsCOMPtr<nsIScreen> mPrimaryScreen; // cache the screen for single-monitor systems
public:
// InitFontInfoList and nsHashTable are static because GetMacFontNumber is static

7
gfx/src/windows/nsDeviceContextWin.cpp
View File

@ -237,11 +237,10 @@ void
nsDeviceContextWin :: FindScreen ( nsIScreen** outScreen )
{
// optimize for the case where we only have one monitor.
static nsCOMPtr<nsIScreen> sPrimaryScreen;
if ( !sPrimaryScreen && mScreenManager )
mScreenManager->GetPrimaryScreen ( getter_AddRefs(sPrimaryScreen) );
if ( !mPrimaryScreen && mScreenManager )
mScreenManager->GetPrimaryScreen ( getter_AddRefs(mPrimaryScreen) );
if ( sNumberOfScreens == 1 ) {
NS_IF_ADDREF(*outScreen = sPrimaryScreen.get());
NS_IF_ADDREF(*outScreen = mPrimaryScreen.get());
return;
}

3
gfx/src/windows/nsDeviceContextWin.h
View File

@ -96,7 +96,8 @@ protected:
nsRect mClientRect;
nsIDeviceContextSpec *mSpec;
nsCOMPtr<nsIScreenManager> mScreenManager;
nsCOMPtr<nsIScreenManager> mScreenManager; // cache the screen service
nsCOMPtr<nsIScreen> mPrimaryScreen; // cache the screen for single-monitor systems
static PRUint32 sNumberOfScreens;
public: