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 799813 - Qt/Linux needs GetGLXPixmap() after bug 788042. r=karlt

Browse Source
This commit is contained in:
Jan Beich 2012-10-10 21:11:15 -04:00
parent 97378d7c5c
commit c0e9926e32
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/thebes/gfxXlibSurface.cpp
View File

@ -23,7 +23,7 @@ using namespace mozilla;
gfxXlibSurface::gfxXlibSurface(Display *dpy, Drawable drawable, Visual *visual)
: mPixmapTaken(false), mDisplay(dpy), mDrawable(drawable)
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#if !defined(MOZ_PLATFORM_MAEMO)
, mGLXPixmap(None)
#endif
{
@ -34,7 +34,7 @@ gfxXlibSurface::gfxXlibSurface(Display *dpy, Drawable drawable, Visual *visual)
gfxXlibSurface::gfxXlibSurface(Display *dpy, Drawable drawable, Visual *visual, const gfxIntSize& size)
: mPixmapTaken(false), mDisplay(dpy), mDrawable(drawable), mSize(size)
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#if !defined(MOZ_PLATFORM_MAEMO)
, mGLXPixmap(None)
#endif
{
@ -49,7 +49,7 @@ gfxXlibSurface::gfxXlibSurface(Screen *screen, Drawable drawable, XRenderPictFor
const gfxIntSize& size)
: mPixmapTaken(false), mDisplay(DisplayOfScreen(screen)),
mDrawable(drawable), mSize(size)
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#if !defined(MOZ_PLATFORM_MAEMO)
, mGLXPixmap(None)
#endif
{
@ -67,7 +67,7 @@ gfxXlibSurface::gfxXlibSurface(cairo_surface_t *csurf)
: mPixmapTaken(false),
mSize(cairo_xlib_surface_get_width(csurf),
cairo_xlib_surface_get_height(csurf))
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#if !defined(MOZ_PLATFORM_MAEMO)
, mGLXPixmap(None)
#endif
{
@ -82,7 +82,7 @@ gfxXlibSurface::gfxXlibSurface(cairo_surface_t *csurf)
gfxXlibSurface::~gfxXlibSurface()
{
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#if !defined(MOZ_PLATFORM_MAEMO)
if (mGLXPixmap) {
gl::sDefGLXLib.DestroyPixmap(mGLXPixmap);
}
@ -506,7 +506,7 @@ gfxXlibSurface::XRenderFormat()
return cairo_xlib_surface_get_xrender_format(CairoSurface());
}
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#if !defined(MOZ_PLATFORM_MAEMO)
GLXPixmap
gfxXlibSurface::GetGLXPixmap()
{

6
gfx/thebes/gfxXlibSurface.h
View File

@ -11,7 +11,7 @@
#include <X11/extensions/Xrender.h>
#include <X11/Xlib.h>
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#if !defined(MOZ_PLATFORM_MAEMO)
#include "GLXLibrary.h"
#endif
@ -75,7 +75,7 @@ public:
// server, not the main application.
virtual gfxASurface::MemoryLocation GetMemoryLocation() const;
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#if !defined(MOZ_PLATFORM_MAEMO)
GLXPixmap GetGLXPixmap();
#endif
@ -102,7 +102,7 @@ protected:
gfxIntSize mSize;
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#if !defined(MOZ_PLATFORM_MAEMO)
GLXPixmap mGLXPixmap;
#endif
};