Plugins NativeRenderer X/qt/gtk includes defines cleanup

RESOLVED FIXED in mozilla14

Status

()

Core
Plug-ins
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: romaxa, Assigned: romaxa)

Tracking

(Blocks: 1 bug)

unspecified
mozilla14
x86
Linux
Points:
---
Bug Flags:
in-testsuite -

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 1 obsolete attachment)

(Assignee)

Description

5 years ago
Created attachment 616493 [details] [diff] [review]
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.
Attachment #616493 - Flags: review?(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.
Attachment #616493 - Flags: review?(karlt) → review-
(Assignee)

Comment 2

5 years ago
Created attachment 616723 [details] [diff] [review]
Cleanup a bit X/Qt/Gtk nativeRenderer defines
Assignee: nobody → romaxa
Attachment #616493 - Attachment is obsolete: true
Status: NEW → ASSIGNED
Attachment #616723 - Flags: review?(karlt)
Attachment #616723 - Flags: review?(karlt) → review+
(Assignee)

Comment 3

5 years ago
https://tbpl.mozilla.org/?tree=Try&rev=8ddb5afae7a5
Keywords: checkin-needed
https://hg.mozilla.org/integration/mozilla-inbound/rev/230435e14263
Flags: in-testsuite-
Keywords: checkin-needed
Target Milestone: --- → mozilla14
https://hg.mozilla.org/mozilla-central/rev/230435e14263
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.