mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 746913 - Plugins NativeRenderer X/qt/gtk includes defines cleanup. r=karlt, a=desktop-only
This commit is contained in:
parent
30937a5c5f
commit
8393c9b5f8
@ -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);
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user