Bug 1304637 - Move back to using window display for basic composition paths. r=lsalzman

MozReview-Commit-ID: CutLou4qJi

widget/gtk/X11CompositorWidget.cpp

@@ -21,7 +21,7 @@ X11CompositorWidget::X11CompositorWidget(const CompositorWidgetInitData& aInitDa
   // If we have a nsWindow, then grab the already existing display connection
   // If we don't, then use the init data to connect to the display
   if (aWindow) {
-    mXDisplay = (Display*)aWindow->GetNativeData(NS_NATIVE_COMPOSITOR_DISPLAY);
+    mXDisplay = aWindow->XDisplay();
   } else {
     mXDisplay = XOpenDisplay(aInitData.XDisplayString().get());
   }

widget/gtk/nsWindow.cpp

@@ -7023,12 +7023,9 @@ nsWindow::RoundsWidgetCoordinatesTo()
 void nsWindow::GetCompositorWidgetInitData(mozilla::widget::CompositorWidgetInitData* aInitData)
 {
   #ifdef MOZ_X11
-  Display* xDisplay = (Display*)GetNativeData(NS_NATIVE_COMPOSITOR_DISPLAY);
-  char* xDisplayString = XDisplayString(xDisplay);
-
   *aInitData = mozilla::widget::CompositorWidgetInitData(
                                   mXWindow,
-                                  nsCString(xDisplayString),
+                                  nsCString(XDisplayString(mXDisplay)),
                                   GetClientSize());
   #endif
 }

widget/gtk/nsWindow.h

@@ -346,6 +346,9 @@ public:
                                                 nsIObserver* aObserver) override;
 #endif
 
+#ifdef MOZ_X11
+    Display* XDisplay() { return mXDisplay; }
+#endif
     virtual void GetCompositorWidgetInitData(mozilla::widget::CompositorWidgetInitData* aInitData) override;
 
     // HiDPI scale conversion