Backed out changeset 880f56e1656b (bug 1603839) for causing build bustages on GtkCompositorWidget.h

CLOSED TREE

Author: aiakab

widget/gtk/CompositorWidgetParent.cpp

@@ -13,8 +13,8 @@ namespace widget {
 CompositorWidgetParent::CompositorWidgetParent(
     const CompositorWidgetInitData& aInitData,
     const layers::CompositorOptions& aOptions)
-    : GtkCompositorWidget(aInitData.get_GtkCompositorWidgetInitData(), aOptions,
-                          nullptr) {
+    : GtkCompositorWidget(aInitData.get_GtkCompositorWidgetInitData(),
+                          aOptions) {
   MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_GPU);
 }
 

widget/gtk/GtkCompositorWidget.cpp

@@ -27,10 +27,9 @@ GtkCompositorWidget::GtkCompositorWidget(
   }
 
 #ifdef MOZ_WAYLAND
-  if (!aInitData.IsX11Display()) {
-    if (!aWindow) {
-      NS_WARNING("GtkCompositorWidget: We're missing nsWindow!");
-    }
+  if (!mXDisplay) {
+    MOZ_RELEASE_ASSERT(
+        aWindow, "We're running on Wayland and but without valid nsWindow.");
     mProvider.Initialize(aWindow);
   } else
 #endif
@@ -93,9 +92,7 @@ uintptr_t GtkCompositorWidget::GetWidgetKey() {
 }
 
 EGLNativeWindowType GtkCompositorWidget::GetEGLNativeWindow() {
-  return mWidget
-             ? (EGLNativeWindowType)mWidget->GetNativeData(NS_NATIVE_EGL_WINDOW)
-             : nullptr;
+  return (EGLNativeWindowType)mWidget->GetNativeData(NS_NATIVE_EGL_WINDOW);
 }
 
 #ifdef MOZ_WAYLAND

widget/gtk/GtkCompositorWidget.h

@@ -35,7 +35,7 @@ class GtkCompositorWidget : public CompositorWidget,
  public:
   GtkCompositorWidget(const GtkCompositorWidgetInitData& aInitData,
                       const layers::CompositorOptions& aOptions,
-                      nsWindow* aWindow /* = nullptr*/);
+                      nsWindow* aWindow = nullptr);
   ~GtkCompositorWidget();
 
   // CompositorWidget Overrides
@@ -78,7 +78,6 @@ class GtkCompositorWidget : public CompositorWidget,
   Display* mXDisplay;
   Window mXWindow;
   WindowSurfaceProvider mProvider;
-  bool mIsX11Display;
 };
 
 }  // namespace widget

widget/gtk/PlatformWidgetTypes.ipdlh

@@ -16,7 +16,6 @@ struct GtkCompositorWidgetInitData
   uintptr_t           XWindow;
   nsCString           XDisplayString;
   bool                Shaped;
-  bool                IsX11Display;
 
   LayoutDeviceIntSize InitialClientSize;
 };

widget/gtk/nsWindow.cpp

@@ -7844,12 +7844,11 @@ void nsWindow::GetCompositorWidgetInitData(
     XFlush(mXDisplay);
   }
 
-  bool isShaped =
-      mIsTransparent && !mHasAlphaVisual && !mTransparencyBitmapForTitlebar;
   *aInitData = mozilla::widget::GtkCompositorWidgetInitData(
       (mXWindow != X11None) ? mXWindow : (uintptr_t) nullptr,
-      mXDisplay ? nsCString(XDisplayString(mXDisplay)) : nsCString(), isShaped,
-      mIsX11Display, GetClientSize());
+      mXDisplay ? nsCString(XDisplayString(mXDisplay)) : nsCString(),
+      mIsTransparent && !mHasAlphaVisual && !mTransparencyBitmapForTitlebar,
+      GetClientSize());
 }
 
 #ifdef MOZ_WAYLAND