Closed Bug 746913 Opened 8 years ago Closed 8 years ago

Plugins NativeRenderer X/qt/gtk includes defines cleanup

Categories

(Core :: Plug-ins, defect)

x86
Linux
defect
Not set

Tracking

()

RESOLVED FIXED
mozilla14

People

(Reporter: romaxa, Assigned: romaxa)

References

Details

Attachments

(1 file, 1 obsolete file)

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: nobody → romaxa
Attachment #616493 - Attachment is obsolete: true
Status: NEW → ASSIGNED
Attachment #616723 - Flags: review?(karlt)
Attachment #616723 - Flags: review?(karlt) → review+
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
Closed: 8 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.