Merge lp:~alan-griffiths/mir/fix-bug-1152628 into lp:~mir-team/mir/trunk

[Alan Griffiths]

compositor: avoid storing invalid reference

compositor: avoid storing invalid reference

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:479
http://jenkins.qa.ubuntu.com/job/mir-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/25//console
    None: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/772/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/25//rebuild/?

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'src/compositor/compositor.cpp'
--- src/compositor/compositor.cpp	2013-03-04 16:02:02 +0000
+++ src/compositor/compositor.cpp	2013-03-08 16:37:27 +0000
@@ -46,15 +46,17 @@
 
 struct FilterForVisibleRenderablesInRegion : public mc::FilterForRenderables
 {
-    FilterForVisibleRenderablesInRegion(mir::geometry::Rectangle enclosing_region)
+    FilterForVisibleRenderablesInRegion(mir::geometry::Rectangle const& enclosing_region)
         : enclosing_region(enclosing_region)
     {
     }
     bool operator()(mg::Renderable& renderable)
     {
+        // TODO check against enclosing_region
         return !renderable.hidden();
     }
-    mir::geometry::Rectangle& enclosing_region;
+
+    mir::geometry::Rectangle const& enclosing_region;
 };
 
 }