Merge lp:~unity-team/nux/areas-unqueue-relayout into lp:nux

[Marco Trevisan (Treviño)]

Area: always make sure we remove an object from layout queue

It was done only for View's and Layout's before, but doing it for each area is better

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:853
http://jenkins.qa.ubuntu.com/job/nux-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-utopic-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-utopic-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/114/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'Nux/Area.cpp'
--- Nux/Area.cpp	2013-11-08 04:25:39 +0000
+++ Nux/Area.cpp	2014-09-17 01:29:46 +0000
@@ -74,6 +74,15 @@
 
   Area::~Area()
   {
+    // It is possible that the window thread has been deleted before the area
+    // itself, so check prior to calling RemoveObjectFromLayoutQueue.
+    WindowThread* wt = GetWindowThread();
+    if (wt)
+    {
+      // It is possible that the object is in the refresh list. Remove it here
+      // before it is deleted.
+      wt->RemoveObjectFromLayoutQueue(this);
+    }
     ResetDownwardPathToKeyFocusArea();
     ResetUpwardPathToKeyFocusArea();
   }
 
=== modified file 'Nux/Layout.cpp'
--- Nux/Layout.cpp	2014-02-22 03:50:49 +0000
+++ Nux/Layout.cpp	2014-09-17 01:29:46 +0000
@@ -49,12 +49,6 @@
 
   Layout::~Layout()
   {
-    // It is possible that this layout object is in the refresh list. Remove
-    // it here before it is deleted.
-    WindowThread* wt = GetWindowThread();
-    if (wt)
-      wt->RemoveObjectFromLayoutQueue(this);
-
     std::list<Area *>::iterator it;
 
     for (it = _layout_element_list.begin(); it != _layout_element_list.end(); it++)
 
=== modified file 'Nux/View.cpp'
--- Nux/View.cpp	2013-11-06 14:31:20 +0000
+++ Nux/View.cpp	2014-09-17 01:29:46 +0000
@@ -44,17 +44,6 @@
     backup_texture_.Release();
     backup_depth_texture_.Release();
     background_texture_.Release();
-    
-    // It is possible that the window thread has been deleted before the view
-    // itself, so check prior to calling.
-    WindowThread* wt = GetWindowThread();
-
-    if (wt)
-    {
-      // It is possible that the object is in the refresh list. Remove it here
-      // before it is deleted.
-      wt->RemoveObjectFromLayoutQueue(this);
-    }
 
     RemoveLayout();
   }