Last Comment Bug 746913 - Plugins NativeRenderer X/qt/gtk includes defines cleanup
: Plugins NativeRenderer X/qt/gtk includes defines cleanup
Status: RESOLVED FIXED
:
Product: Core
Classification: Components
Component: Plug-ins (show other bugs)
: unspecified
: x86 Linux
: -- normal (vote)
: mozilla14
Assigned To: Oleg Romashin (:romaxa)
:
Mentors:
Depends on:
Blocks: b2g-on-linux
  Show dependency treegraph
 
Reported: 2012-04-19 01:23 PDT by Oleg Romashin (:romaxa)
Modified: 2012-04-20 20:01 PDT (History)
3 users (show)
ryanvm: in‑testsuite-
See Also:
Crash Signature:
(edit)
QA Whiteboard:
Iteration: ---
Points: ---
Has Regression Range: ---
Has STR: ---


Attachments
Cleanup a bit X/Qt/Gtk nativeRenderer defines (2.93 KB, patch)
2012-04-19 01:23 PDT, Oleg Romashin (:romaxa)
karlt: review-
Details | Diff | Review
Cleanup a bit X/Qt/Gtk nativeRenderer defines (2.97 KB, patch)
2012-04-19 13:11 PDT, Oleg Romashin (:romaxa)
karlt: review+
Details | Diff | Review

Description Oleg Romashin (:romaxa) 2012-04-19 01:23:20 PDT
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.
Comment 1 Karl Tomlinson (ni?:karlt) 2012-04-19 02:19:36 PDT
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) 2012-04-19 13:11:25 PDT
Created attachment 616723 [details] [diff] [review]
Cleanup a bit X/Qt/Gtk nativeRenderer defines
Comment 3 Oleg Romashin (:romaxa) 2012-04-19 17:42:23 PDT
https://tbpl.mozilla.org/?tree=Try&rev=8ddb5afae7a5
Comment 4 Ryan VanderMeulen [:RyanVM] 2012-04-20 14:17:55 PDT
https://hg.mozilla.org/integration/mozilla-inbound/rev/230435e14263
Comment 5 Phil Ringnalda (:philor) 2012-04-20 20:01:57 PDT
https://hg.mozilla.org/mozilla-central/rev/230435e14263

Note You need to log in before you can comment on or make changes to this bug.