wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 989349 - part 1 - use StaticRefPtr instead of nsRefPtr in GLContextProviderGLX.cpp; r=bjacob

Browse Source
This commit is contained in:
Nathan Froyd 2014-03-26 09:10:27 -04:00
parent 1b9927f537
commit be2baec6f7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/gl/GLContextProviderGLX.cpp
View File

@ -15,6 +15,7 @@
#include <X11/Xutil.h>
#include "mozilla/MathAlgorithms.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/X11Util.h"
#include "prenv.h"
@ -1188,7 +1189,7 @@ GLContextProviderGLX::CreateOffscreen(const gfxIntSize& size,
return glContext.forget();
}
static nsRefPtr<GLContext> gGlobalContext;
static StaticRefPtr<GLContext> gGlobalContext;
// TODO move that out of static initializaion
static bool gUseContextSharing = getenv("MOZ_DISABLE_CONTEXT_SHARING_GLX") == 0;
@ -1205,7 +1206,11 @@ GLContextProviderGLX::GetGlobalContext()
triedToCreateContext = true;
gfxIntSize dummySize = gfxIntSize(16, 16);
gGlobalContext = CreateOffscreenPixmapContext(dummySize);
// StaticPtr doesn't support assignments from already_AddRefed,
// so use a temporary nsRefPtr to make the reference counting
// fall out correctly.
nsRefPtr<GLContext> holder = CreateOffscreenPixmapContext(dummySize);
gGlobalContext = holder;
}
return gGlobalContext;