Merge lp:~aacid/ubuntu-ui-toolkit/betterConnectForAboutToBeDestroyed into lp:ubuntu-ui-toolkit/staging

[Albert Astals Cid]

Properly free shapeTextures[index]

The old code assumes that the UbuntuShape will still be around when the opengl context is destroyed, but that seldom happens so connect the signal to a lambda that will be there and does the cleanup properly

Without this patch testDirectionalDragArea from unity8 was hitting the qFatal because it ran out of space in shapeTextures

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1613
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/873
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/873/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/870

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2143/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Nice catch, thank you!

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-12 10:15:43 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-19 10:04:29 +0000
@@ -984,15 +984,6 @@
     updateFromImageProperties(qobject_cast<QQuickItem*>(sender()));
 }
 
-void UCUbuntuShape::_q_openglContextDestroyed()
-{
-    // Delete the shape textures that are stored per context and shared by all the shape items.
-    const int index = getShapeTexturesIndex(qobject_cast<QOpenGLContext*>(sender()));
-    Q_ASSERT(index >= 0);
-    shapeTextures[index].openglContext = NULL;
-    glDeleteTextures(shapeTextureCount, shapeTextures[index].textureId);
-}
-
 void UCUbuntuShape::_q_gridUnitChanged()
 {
     const float gridUnitInDevicePixels = UCUnits::instance().gridUnit() / qGuiApp->devicePixelRatio();
@@ -1145,8 +1136,10 @@
             glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, shapeTextureSize, shapeTextureSize, 0, GL_RGBA,
                          GL_UNSIGNED_BYTE, shapeTextureData[i]);
         }
-        QObject::connect(openglContext, SIGNAL(aboutToBeDestroyed()), this,
-                         SLOT(_q_openglContextDestroyed()), Qt::DirectConnection);
+        connect(openglContext, &QOpenGLContext::aboutToBeDestroyed, [index] {
+            shapeTextures[index].openglContext = NULL;
+            glDeleteTextures(shapeTextureCount, shapeTextures[index].textureId);
+        } );
     }
     const quint32 shapeTextureId = shapeTextures[index].textureId[m_aspect != DropShadow ? 0 : 1];
 

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.h'
--- src/Ubuntu/Components/plugin/ucubuntushape.h	2015-08-06 13:16:24 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.h	2015-08-19 10:04:29 +0000
@@ -296,7 +296,6 @@
 
 private Q_SLOTS:
     void _q_imagePropertiesChanged();
-    void _q_openglContextDestroyed();
     void _q_gridUnitChanged();
     void _q_providerDestroyed(QObject* object=0);
     void _q_textureChanged();