Merge lp:~unity-team/unity/x-sru6 into lp:unity/7.4

[Marco Trevisan (Treviño)]

Unity Xenial SRU6

[Andrea Azzarone (azzar1)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-12-01 18:46:01 +0000
+++ debian/changelog	2018-02-21 19:31:24 +0000
@@ -1,3 +1,13 @@
+unity (7.4.5+16.04.20171201.3ubuntu1) UNRELEASED; urgency=medium
+
+  * Unity use track_obj to safely connect to UScreen and Settings
+    signals (LP: #1748330) (LP: #1748330)
+  * CairoBaseWindow: don't try to compute the blur of an invalid texture
+    (LP: #1290056)
+  * Unity: use new definition of infinite CompRegion's
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 19 Feb 2018 15:41:34 +0100
+
 unity (7.4.5+16.04.20171201.3) xenial; urgency=medium
 
   [ Marco Trevisan (Treviño) ]

=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2016-09-01 23:57:13 +0000
+++ decorations/DecoratedWindow.cpp	2018-02-21 19:31:24 +0000
@@ -816,7 +816,9 @@
     return;
   }
 
-  auto const& clip_region = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ? infiniteRegion : region;
+  auto const& clip_region = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ?
+                             CompRegion::infinite() : region;
+
   mask |= PAINT_WINDOW_BLEND_MASK;
 
   if (win_->alpha() || attrib.opacity != OPAQUE)

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2016-07-05 10:22:42 +0000
+++ hud/HudController.cpp	2018-02-21 19:31:24 +0000
@@ -83,7 +83,7 @@
   }
 
   SetupWindow();
-  UScreen::GetDefault()->changed.connect([this] (int, std::vector<nux::Geometry> const&) { Relayout(true); });
+  UScreen::GetDefault()->changed.connect(sigc::track_obj([this] (int, std::vector<nux::Geometry> const&) { Relayout(true); }, *this));
 
   ubus.RegisterInterest(UBUS_HUD_CLOSE_REQUEST, sigc::mem_fun(this, &Controller::OnExternalHideHud));
 

=== modified file 'launcher/CairoBaseWindow.cpp'
--- launcher/CairoBaseWindow.cpp	2016-07-05 10:22:42 +0000
+++ launcher/CairoBaseWindow.cpp	2018-02-21 19:31:24 +0000
@@ -110,8 +110,14 @@
 
     nux::ObjectPtr <nux::IOpenGLBaseTexture> bkg_texture = gfxContext.CreateTextureFromBackBuffer(base.x, base.y, base.width, base.height);
 
-    nux::TexCoordXForm texxform_bkg;
-    bg_blur_texture_ = gfxContext.QRP_GetBlurTexture(0, 0, base.width, base.height, bkg_texture, texxform_bkg, nux::color::White, 1.0f, 3);
+    if (bkg_texture.IsValid())
+    {
+      nux::TexCoordXForm texxform_bkg;
+      bg_blur_texture_ = gfxContext.QRP_GetBlurTexture(0, 0, base.width, base.height, bkg_texture, texxform_bkg, nux::color::White, 1.0f, 3);
+
+      if (bg_blur_texture_)
+        compute_blur_bkg_ = false;
+    }
 
     if (current_fbo.IsValid())
     {
@@ -124,7 +130,6 @@
       gfxContext.Push2DWindow(gfxContext.GetWindowWidth(), gfxContext.GetWindowHeight());
       gfxContext.ApplyClippingRectangle();
     }
-    compute_blur_bkg_ = false;
   }
 
   // the elements position inside the window are referenced to top-left window

=== modified file 'launcher/EdgeBarrierController.cpp'
--- launcher/EdgeBarrierController.cpp	2016-09-01 23:56:32 +0000
+++ launcher/EdgeBarrierController.cpp	2018-02-21 19:31:24 +0000
@@ -48,16 +48,17 @@
   auto monitors = uscreen->GetMonitors();
   ResizeBarrierList(monitors);
 
-  /* FIXME: Back to c++11 lambda once we get sigc::track_obj.
-  uscreen->changed.connect(sigc::track_obj(([this](int primary, std::vector<nux::Geometry> const& layout) {
-    ResizeBarrierList(layout);
-    SetupBarriers(layout);
-  }));*/
-
-  uscreen->changed.connect(sigc::mem_fun(this, &EdgeBarrierController::Impl::OnUScreenChanged));
-  Settings::Instance().launcher_position.changed.connect(sigc::hide(sigc::mem_fun(this, &EdgeBarrierController::Impl::OnOptionsChanged)));
-
-  parent_->force_disable.changed.connect(sigc::mem_fun(this, &EdgeBarrierController::Impl::OnForceDisableChanged));
+  uscreen->changed.connect(sigc::track_obj([this] (int primary, std::vector<nux::Geometry> const& layout) {
+    ResetBarriers();
+  }, *this));
+
+  parent_->force_disable.changed.connect(sigc::track_obj([this] (bool) {
+    ResetBarriers();
+  }, *this));
+
+  Settings::Instance().launcher_position.changed.connect(sigc::track_obj([this] (LauncherPosition) {
+    ResetBarriers();
+  }, *this));
 
   parent_->sticky_edges.SetGetterFunction([this] {
     return parent_->options() ? parent_->options()->edge_resist() : false;
@@ -73,12 +74,11 @@
   });
 
   parent_->options.changed.connect([this](launcher::Options::Ptr options) {
-    /* FIXME: Back to c++11 lambda once we get sigc::track_obj.
-    options->option_changed.connect([this]() {
-      SetupBarriers(UScreen::GetDefault()->GetMonitors());
-    });*/
-    options->option_changed.connect(sigc::mem_fun(this, &EdgeBarrierController::Impl::OnOptionsChanged));
-    SetupBarriers(UScreen::GetDefault()->GetMonitors());
+    options->option_changed.connect(sigc::track_obj([this] {
+      ResetBarriers();
+    }, *this));
+
+    ResetBarriers();
   });
 }
 
@@ -87,33 +87,20 @@
   nux::GetGraphicsDisplay()->RemoveEventFilter(this);
 }
 
-void EdgeBarrierController::Impl::OnUScreenChanged(int primary, std::vector<nux::Geometry> const& layout)
-{
-  ResizeBarrierList(layout);
-  SetupBarriers(layout);
-}
-
-void EdgeBarrierController::Impl::OnForceDisableChanged(bool value)
-{
-  auto monitors = UScreen::GetDefault()->GetMonitors();
+void EdgeBarrierController::Impl::ResetBarriers()
+{
+  auto const& monitors = UScreen::GetDefault()->GetMonitors();
   ResizeBarrierList(monitors);
   SetupBarriers(monitors);
 }
 
-void EdgeBarrierController::Impl::OnOptionsChanged()
-{
-  SetupBarriers(UScreen::GetDefault()->GetMonitors());
-}
-
 void EdgeBarrierController::Impl::AddSubscriber(EdgeBarrierSubscriber* subscriber, unsigned int monitor, std::vector<EdgeBarrierSubscriber*>& subscribers)
 {
   if (monitor >= subscribers.size())
     subscribers.resize(monitor + 1);
 
-  auto const& monitors = UScreen::GetDefault()->GetMonitors();
   subscribers[monitor] = subscriber;
-  ResizeBarrierList(monitors);
-  SetupBarriers(monitors);
+  ResetBarriers();
 }
 
 void EdgeBarrierController::Impl::RemoveSubscriber(EdgeBarrierSubscriber* subscriber, unsigned int monitor, std::vector<EdgeBarrierSubscriber*>& subscribers)
@@ -121,10 +108,8 @@
   if (monitor >= subscribers.size() || subscribers[monitor] != subscriber)
     return;
 
-  auto const& monitors = UScreen::GetDefault()->GetMonitors();
   subscribers[monitor] = nullptr;
-  ResizeBarrierList(monitors);
-  SetupBarriers(monitors);
+  ResetBarriers();
 }
 
 void EdgeBarrierController::Impl::ResizeBarrierList(std::vector<nux::Geometry> const& layout)

=== modified file 'launcher/EdgeBarrierControllerPrivate.h'
--- launcher/EdgeBarrierControllerPrivate.h	2016-09-01 23:56:32 +0000
+++ launcher/EdgeBarrierControllerPrivate.h	2018-02-21 19:31:24 +0000
@@ -40,10 +40,7 @@
 
   void ResizeBarrierList(std::vector<nux::Geometry> const& layout);
   void SetupBarriers(std::vector<nux::Geometry> const& layout);
-
-  void OnUScreenChanged(int primary, std::vector<nux::Geometry> const& layout);
-  void OnForceDisableChanged(bool value);
-  void OnOptionsChanged();
+  void ResetBarriers();
 
   void OnPointerBarrierEvent(PointerBarrierWrapper::Ptr const& owner, BarrierEvent::Ptr const& event);
   void BarrierPush(PointerBarrierWrapper::Ptr const& owner, BarrierEvent::Ptr const& event);

=== modified file 'plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp'
--- plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2013-11-17 18:12:54 +0000
+++ plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2018-02-21 19:31:24 +0000
@@ -480,7 +480,7 @@
         matl.push_back(mat);
 
         if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
-          paintRegion = infiniteRegion;
+          paintRegion = CompRegion::infinite();
 
         /* Now allow plugins to mess with the geometry of our
          * dim (so we get a nice render for things like

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2017-09-25 16:04:00 +0000
+++ plugins/unityshell/src/unityshell.cpp	2018-02-21 19:31:24 +0000
@@ -979,7 +979,7 @@
         /* force the use of the core functions */
         uTrayWindow->gWindow->glDrawSetCurrentIndex (MAXSHORT);
         uTrayWindow->gWindow->glAddGeometrySetCurrentIndex ( MAXSHORT);
-        uTrayWindow->gWindow->glDraw (oTransform, attrib, infiniteRegion,
+        uTrayWindow->gWindow->glDraw (oTransform, attrib, CompRegion::infinite (),
                PAINT_WINDOW_TRANSFORMED_MASK |
                PAINT_WINDOW_BLEND_MASK |
                PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK);
@@ -4194,13 +4194,13 @@
     }
   };
 
-  UScreen::GetDefault()->changed.connect([this, check_launchers_size] (int, std::vector<nux::Geometry> const&) {
+  UScreen::GetDefault()->changed.connect(sigc::track_obj([this, check_launchers_size] (int, std::vector<nux::Geometry> const&) {
     check_launchers_size();
-  });
+  }, *this));
 
-  Settings::Instance().launcher_position.changed.connect([this, check_launchers_size] (LauncherPosition const&) {
+  Settings::Instance().launcher_position.changed.connect(sigc::track_obj([this, check_launchers_size] (LauncherPosition const&) {
     check_launchers_size();
-  });
+  }, *this));
 
   check_launchers_size();