Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 672361 - Fix memory management of mIOSurface; r=smichaud

Browse Source
This commit is contained in:
Benoit Girard 2011-07-19 11:14:00 -04:00
parent c8b8d529a5
commit b0edec37c3
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/plugins/base/nsPluginInstanceOwner.cpp
View File

@ -305,7 +305,6 @@ nsPluginInstanceOwner::nsPluginInstanceOwner()
#endif
mInCGPaintLevel = 0;
mSentInitialTopLevelWindowEvent = PR_FALSE;
mIOSurface = nsnull;
mColorProfile = nsnull;
mPluginPortChanged = PR_FALSE;
#endif
@ -1472,7 +1471,7 @@ void nsPluginInstanceOwner::RenderCoreAnimation(CGContextRef aCGContext,
if (!mIOSurface ||
(mIOSurface->GetWidth() != (size_t)aWidth ||
mIOSurface->GetHeight() != (size_t)aHeight)) {
delete mIOSurface;
mIOSurface = nsnull;
// If the renderer is backed by an IOSurface, resize it as required.
mIOSurface = nsIOSurface::CreateIOSurface(aWidth, aHeight);
@ -1483,9 +1482,7 @@ void nsPluginInstanceOwner::RenderCoreAnimation(CGContextRef aCGContext,
mCARenderer.AttachIOSurface(attachSurface);
} else {
NS_ERROR("IOSurface attachment failed");
delete attachSurface;
delete mIOSurface;
mIOSurface = NULL;
mIOSurface = nsnull;
}
}
}
@ -2499,7 +2496,6 @@ nsPluginInstanceOwner::Destroy()
#endif
#ifdef XP_MACOSX
RemoveFromCARefreshTimer(this);
delete mIOSurface;
if (mColorProfile)
::CGColorSpaceRelease(mColorProfile);
#endif