Commit da41393b authored by Martin Stransky's avatar Martin Stransky
Browse files

Bug 1425842 - Rename X11CompositorWidget to GtkCompositorWidget and implement... 

Bug 1425842 - Rename X11CompositorWidget to GtkCompositorWidget and implement WindowSurfaceWayland support, r=jhorak

- Rename X11CompositorWidget to GtkCompositorWidget to handle both X11 and Wayland backends.
- Rename X11CompositorWidgetInitData to GtkCompositorWidgetInitData
- Implement Wayland support at WindowSurfaceProvider, WindowSurfaceProvider::CreateWindowSurface()
  is able to create WindowSurfaceWayland.
- Initialize Wayland surface provider at nsWindow::Create()

MozReview-Commit-ID: 1WvR9nWHa3L

--HG--
rename : widget/gtk/X11CompositorWidget.cpp => widget/gtk/GtkCompositorWidget.cpp
rename : widget/gtk/X11CompositorWidget.h => widget/gtk/GtkCompositorWidget.h
rename : widget/gtk/InProcessX11CompositorWidget.cpp => widget/gtk/InProcessGtkCompositorWidget.cpp
rename : widget/gtk/InProcessX11CompositorWidget.h => widget/gtk/InProcessGtkCompositorWidget.h
extra : rebase_source : d54186515b066b957d8ad05bb5540db55f2e9415
parent c15479b4

gfx/gl/GLContextProviderGLX.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "mozilla/StaticPtr.h"

#include "mozilla/layers/CompositorOptions.h"

#include "mozilla/widget/CompositorWidget.h"

#include "mozilla/widget/X11CompositorWidget.h"

#include "mozilla/widget/GtkCompositorWidget.h"

#include "mozilla/Unused.h"



#include "prenv.h"
@@ -803,7 +803,7 @@ CreateForWidget(Display* aXDisplay, Window aXWindow, 
already_AddRefed<GLContext>

GLContextProviderGLX::CreateForCompositorWidget(CompositorWidget* aCompositorWidget, bool aForceAccelerated)

{

    X11CompositorWidget* compWidget = aCompositorWidget->AsX11();

    GtkCompositorWidget* compWidget = aCompositorWidget->AsX11();

    MOZ_ASSERT(compWidget);



    return CreateForWidget(compWidget->XDisplay(),

widget/CompositorWidget.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class SourceSurface; 
namespace widget {



class WinCompositorWidget;

class X11CompositorWidget;

class GtkCompositorWidget;

class AndroidCompositorWidget;

class CompositorWidgetInitData;
@@ -287,7 +287,7 @@ public: 
  virtual WinCompositorWidget* AsWindows() {

    return nullptr;

  }

  virtual X11CompositorWidget* AsX11() {

  virtual GtkCompositorWidget* AsX11() {

    return nullptr;

  }

  virtual AndroidCompositorWidget* AsAndroid() {

widget/gtk/CompositorWidgetChild.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef widget_gtk_CompositorWidgetChild_h

#define widget_gtk_CompositorWidgetChild_h



#include "X11CompositorWidget.h"

#include "GtkCompositorWidget.h"

#include "mozilla/widget/PCompositorWidgetChild.h"

#include "mozilla/widget/CompositorWidgetVsyncObserver.h"

widget/gtk/CompositorWidgetParent.cpp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ namespace widget { 


CompositorWidgetParent::CompositorWidgetParent(const CompositorWidgetInitData& aInitData,

                                               const layers::CompositorOptions& aOptions)

 : X11CompositorWidget(aInitData.get_X11CompositorWidgetInitData(), aOptions)

 : GtkCompositorWidget(aInitData.get_GtkCompositorWidgetInitData(), aOptions)

{

  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_GPU);

}

widget/gtk/CompositorWidgetParent.h

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef widget_gtk_CompositorWidgetParent_h

#define widget_gtk_CompositorWidgetParent_h



#include "X11CompositorWidget.h"

#include "GtkCompositorWidget.h"

#include "mozilla/widget/PCompositorWidgetParent.h"



namespace mozilla {
@@ -14,7 +14,7 @@ namespace widget { 


class CompositorWidgetParent final

 : public PCompositorWidgetParent,

   public X11CompositorWidget

   public GtkCompositorWidget

{

public:

  explicit CompositorWidgetParent(const CompositorWidgetInitData& aInitData,