Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 23 Jan 2019 14:55:03 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r491042 - head/www/firefox/files
Message-ID:  <201901231455.x0NEt3kY021553@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Wed Jan 23 14:55:02 2019
New Revision: 491042
URL: https://svnweb.freebsd.org/changeset/ports/491042

Log:
  www/firefox: unbreak WAYLAND=off build after r490910
  
  In file included from ../.build/gfx/webrender_bindings/Unified_cpp_webrender_bindings0.cpp:20:
  gfx/webrender_bindings/RenderCompositor.cpp:35:47: error: use of undeclared identifier 'RenderCompositorEGL'; did you mean 'RenderCompositorOGL'?
    UniquePtr<RenderCompositor> eglCompositor = RenderCompositorEGL::Create(aWidget);
                                                ^~~~~~~~~~~~~~~~~~~
                                                RenderCompositorOGL
  ../.build/dist/include/mozilla/webrender/RenderCompositorOGL.h:16:7: note: 'RenderCompositorOGL' declared here
  class RenderCompositorOGL : public RenderCompositor {
        ^
  In file included from ../.build/gfx/webrender_bindings/Unified_cpp_webrender_bindings0.cpp:20:
  gfx/webrender_bindings/RenderCompositor.cpp:35:75: error: rvalue reference to type 'RefPtr<...>' cannot bind to lvalue of type 'RefPtr<...>'
    UniquePtr<RenderCompositor> eglCompositor = RenderCompositorEGL::Create(aWidget);
                                                                            ^~~~~~~
  ../.build/dist/include/mozilla/webrender/RenderCompositorOGL.h:19:42: note: passing argument to parameter 'aWidget' here
        RefPtr<widget::CompositorWidget>&& aWidget);
                                           ^
  
  PR:		233791
  Reported by:	many

Modified:
  head/www/firefox/files/patch-bug1514156   (contents, props changed)

Modified: head/www/firefox/files/patch-bug1514156
==============================================================================
--- head/www/firefox/files/patch-bug1514156	Wed Jan 23 14:40:53 2019	(r491041)
+++ head/www/firefox/files/patch-bug1514156	Wed Jan 23 14:55:02 2019	(r491042)
@@ -98,7 +98,7 @@ index 051482fbabbf..a58268096a89 100644
    }
  #endif
 +
-+#ifdef MOZ_WIDGET_GTK
++#ifdef MOZ_WAYLAND
 +  UniquePtr<RenderCompositor> eglCompositor = RenderCompositorEGL::Create(aWidget);
 +  if (eglCompositor) {
 +    return eglCompositor;
@@ -371,13 +371,15 @@ diff --git widget/gtk/CompositorWidgetParent.cpp widge
 index ae49ec9174bc..b4031883d3a8 100644
 --- widget/gtk/CompositorWidgetParent.cpp
 +++ widget/gtk/CompositorWidgetParent.cpp
-@@ -40,5 +40,11 @@ mozilla::ipc::IPCResult CompositorWidgetParent::RecvNotifyClientSizeChanged(
+@@ -40,5 +40,13 @@ mozilla::ipc::IPCResult CompositorWidgetParent::RecvNotifyClientSizeChanged(
    return IPC_OK();
  }
  
 +mozilla::ipc::IPCResult CompositorWidgetParent::RecvRequestsUpdatingEGLSurface()
 +{
++#ifdef MOZ_WAYLAND
 +  RequestsUpdatingEGLSurface();
++#endif
 +  return IPC_OK();
 +}
 +
@@ -400,13 +402,16 @@ diff --git widget/gtk/GtkCompositorWidget.cpp widget/g
 index bc21d6c4d05e..f787e8c23797 100644
 --- widget/gtk/GtkCompositorWidget.cpp
 +++ widget/gtk/GtkCompositorWidget.cpp
-@@ -17,7 +17,8 @@ namespace widget {
+@@ -17,7 +17,11 @@ namespace widget {
  GtkCompositorWidget::GtkCompositorWidget(
      const GtkCompositorWidgetInitData& aInitData,
      const layers::CompositorOptions& aOptions, nsWindow* aWindow)
 -    : CompositorWidget(aOptions), mWidget(aWindow) {
-+    : CompositorWidget(aOptions), mWidget(aWindow),
-+      mWaylandRequestsUpdatingEGLSurface(false) {
++    : CompositorWidget(aOptions), mWidget(aWindow)
++#ifdef MOZ_WAYLAND
++    , mWaylandRequestsUpdatingEGLSurface(false)
++#endif
++    {
    // 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) {
@@ -444,7 +449,7 @@ index fd0c71426c18..75e156dffb02 100644
    // CompositorWidgetDelegate Overrides
  
    PlatformCompositorWidgetDelegate* AsPlatformSpecificDelegate() override {
-@@ -62,11 +66,16 @@ class GtkCompositorWidget : public CompositorWidget,
+@@ -62,11 +66,18 @@ class GtkCompositorWidget : public CompositorWidget,
  
    void NotifyClientSizeChanged(const LayoutDeviceIntSize& aClientSize) override;
  
@@ -457,7 +462,9 @@ index fd0c71426c18..75e156dffb02 100644
  
   private:
    LayoutDeviceIntSize mClientSize;
++#ifdef MOZ_WAYLAND
 +  bool mWaylandRequestsUpdatingEGLSurface;
++#endif
  
    Display* mXDisplay;
    Window mXWindow;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901231455.x0NEt3kY021553>