Merge lp:~smspillaz/unity/unity.6.0.fix_1036521 into lp:unity/6.0

[Sam Spilsbury]

Don't call GraphicsContext::DeactivateFramebuffer which will immediately restore the backbuffer. Instead call WindowCompositor::RestoreMainFramebuffer to bind either the backbuffer or reference framebuffer for reading as that is the one we're drawing to as is the most-up-to-date

Test Suite: https://code.launchpad.net/~smspillaz/nux/nux.3.0.fix_1036521/+merge/125106

[Daniel van Vugt (vanvugt)]

Verified both bugs fixed.

review: Approve

[Didier Roche (didrocks)]

already merged in trunk. we will sync 7.0 to 6.0

Unmerged revisions

2692. By Sam Spilsbury on 2012-09-19

Don't call GraphicsContext::DeactivateFramebuffer which will immediately restore the backbuffer. Instead call WindowCompositor::RestoreMainFramebuffer to bind either the backbuffer or reference framebuffer for reading as that is the one we're drawing to as is the most-up-to-date

2691. By Andrea Azzarone on 2012-09-18

Use uuid+label as volume ID.. Fixes: . Approved by Marco Trevisan (Treviño).

2690. By Thomi Richards on 2012-09-18

Fix several autopilot tests.. Fixes: . Approved by Omer Akram.

2689. By Thomi Richards on 2012-09-17

Fix several autopilot tests.. Fixes: . Approved by Christopher Lee.

2688. By Ken VanDine on 2012-09-17

Adds SocialPreview. Fixes: https://bugs.launchpad.net/bugs/1049127. Approved by Neil J. Patel.

2687. By Daniel van Vugt on 2012-09-17

Restore the panel shadow, which has been missing since Unity 6.4.
(LP: #1045705)

REQUIRES Compiz fix LP: #1050704. Without that fix, the active window will
always have the panel shadow on top of it.. Fixes: https://bugs.launchpad.net/bugs/1045705. Approved by Brandon Schaefer.

2686. By Paweł Stołowski on 2012-09-17

Register file delete events in zeitgeist when file is dropped onto Trash launcher icon.
Added zeitgeist dependency.. Fixes: https://bugs.launchpad.net/bugs/870150. Approved by Marco Trevisan (Treviño).

2685. By Paweł Stołowski on 2012-09-17

Added two new special icons for missing album cover; to be used by music lens. They don't really fit into unity-asset-pool as they don't have regular sizes.. Fixes: https://bugs.launchpad.net/bugs/1049217. Approved by .

=== modified file 'launcher/CairoBaseWindow.cpp'
--- launcher/CairoBaseWindow.cpp	2012-05-07 22:28:17 +0000
+++ launcher/CairoBaseWindow.cpp	2012-09-19 06:38:29 +0000
@@ -19,6 +19,7 @@
 
 
 #include <Nux/Nux.h>
+#include <Nux/WindowCompositor.h>
 
 #include "unity-shared/CairoTexture.h"
 #include "CairoBaseWindow.h"
@@ -58,7 +59,7 @@
   if (_use_blurred_background && _compute_blur_bkg)
   {
     auto current_fbo = nux::GetGraphicsDisplay()->GetGpuDevice()->GetCurrentFrameBufferObject();
-    nux::GetGraphicsDisplay()->GetGpuDevice()->DeactivateFrameBuffer();
+    nux::GetWindowCompositor ().RestoreMainFramebuffer();
 
     gfxContext.SetViewport(0, 0, gfxContext.GetWindowWidth(), gfxContext.GetWindowHeight());
     gfxContext.SetScissor(0, 0, gfxContext.GetWindowWidth(), gfxContext.GetWindowHeight());