Bug 528429 - MOZ_COMPOSITED_PLUGINS should be disabled when building for Qt. r=vlad
authorDoug Turner <dougt@meer.net>
Fri, 13 Nov 2009 07:10:53 -0800
changeset 34824 fdf4bf245aedb9f7ce093b852cbefbf8a90e9a51
parent 34823 4ececa77bad19a52b9567354cf38c4c13ae08d41
child 34825 8a790e81279e05bcd4de7aac7f69b297b0804432
push idunknown
push userunknown
push dateunknown
reviewersvlad
bugs528429
milestone1.9.3a1pre
Bug 528429 - MOZ_COMPOSITED_PLUGINS should be disabled when building for Qt. r=vlad
layout/generic/nsObjectFrame.cpp
modules/plugin/base/public/nsPluginNativeWindow.h
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -165,17 +165,17 @@ static NS_DEFINE_CID(kAppShellCID, NS_AP
 #ifdef MOZ_X11
 #include <X11/Xlib.h>
 /* X headers suck */
 enum { XKeyPress = KeyPress };
 #ifdef KeyPress
 #undef KeyPress
 #endif
 
-#ifdef MOZ_PLATFORM_HILDON
+#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
 #define MOZ_COMPOSITED_PLUGINS 1
 #endif
 
 #ifdef MOZ_WIDGET_GTK2
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #endif
--- a/modules/plugin/base/public/nsPluginNativeWindow.h
+++ b/modules/plugin/base/public/nsPluginNativeWindow.h
@@ -98,17 +98,17 @@ public:
     if (aPluginInstance)
       aPluginInstance->SetWindow(this);
     else if (mPluginInstance)
       mPluginInstance->SetWindow(nsnull);
 
     SetPluginInstance(aPluginInstance);
     return NS_OK;
   }
-#ifdef MOZ_PLATFORM_HILDON
+#if defined(MOZ_PLATFORM_HILDON) && defined(MOZ_WIDGET_GTK2)
 #define MOZ_COMPOSITED_PLUGINS
 #endif
 #ifdef MOZ_COMPOSITED_PLUGINS
   /* XXX: we use this to leak the socket widget out from nsPlugNativeWindowGtk2
      so that Renderer::NativeDraw() in nsObjectFrame.cpp can draw the widget.
      I don't currently know a better way to do this... */
   void *mPlugWindow;
 #endif