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 746913 - Plugins NativeRenderer X/qt/gtk includes defines cleanup. r=karlt, a=desktop-only

Browse Source
This commit is contained in:
Oleg Romashin 2012-04-20 17:15:59 -04:00
parent 75225e473a
commit ab49f8480c
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,6 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include "gfxXlibNativeRenderer.h"
#endif
#ifdef MOZ_WIDGET_ANDROID
@ -3041,8 +3040,7 @@ void nsPluginInstanceOwner::Paint(gfxContext* aContext,
Visual* visual = gdk_x11_visual_get_xvisual(gdkVisual);
Screen* screen =
gdk_x11_screen_get_xscreen(gdk_visual_get_screen(gdkVisual));
#endif
#ifdef MOZ_WIDGET_QT
#else
Display* dpy = mozilla::DefaultXDisplay();
Screen* screen = DefaultScreenOfDisplay(dpy);
Visual* visual = DefaultVisualOfScreen(screen);

15
dom/plugins/base/nsPluginInstanceOwner.h
View File

@ -76,15 +76,10 @@ class nsDisplayListBuilder;
#ifdef MOZ_X11
class gfxXlibSurface;
#endif
#ifdef MOZ_WIDGET_GTK2
#include "gfxXlibNativeRenderer.h"
#endif
#ifdef MOZ_WIDGET_QT
#ifdef MOZ_X11
#include "gfxQtNativeRenderer.h"
#else
#include "gfxXlibNativeRenderer.h"
#endif
#endif
@ -410,10 +405,10 @@ private:
#ifdef MOZ_X11
class Renderer
#if defined(MOZ_WIDGET_GTK2)
: public gfxXlibNativeRenderer
#elif defined(MOZ_WIDGET_QT)
#if defined(MOZ_WIDGET_QT)
: public gfxQtNativeRenderer
#else
: public gfxXlibNativeRenderer
#endif
{
public: