746913 - Plugins NativeRenderer X/qt/gtk includes defines cleanup

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Oleg Romashin (:romaxa)]

Attachment: Cleanup a bit X/Qt/Gtk nativeRenderer defines

While porting Gecko to FB/PureX11 Honk port, I found one place which could be cleaned up and used for Honk port too without additional HONK ifdefs.

Comment 1

[Karl Tomlinson (:karlt)]

Comment on attachment 616493 [details] [diff] [review]
Cleanup a bit X/Qt/Gtk nativeRenderer defines

> #ifdef MOZ_WIDGET_GTK2
>   // This is the visual used by the widgets, 24-bit if available.
>   GdkVisual* gdkVisual = gdk_rgb_get_visual();
>   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
>+#ifdef MOZ_X11
>   Display* dpy = mozilla::DefaultXDisplay();
>   Screen* screen = DefaultScreenOfDisplay(dpy);
>   Visual* visual = DefaultVisualOfScreen(screen);
> #endif

This is all within a MOZ_X11 test, so I assume you just want an #else so that these are always defined only once.

Comment 2

[Oleg Romashin (:romaxa)]

Attachment: Cleanup a bit X/Qt/Gtk nativeRenderer defines

Comment 3

[Oleg Romashin (:romaxa)]

https://tbpl.mozilla.org/?tree=Try&rev=8ddb5afae7a5

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/230435e14263

Comment 5

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/230435e14263