Merge lp:~zsombi/ubuntu-ui-toolkit/fix-style-lookup-crash into lp:ubuntu-ui-toolkit

[Zsombor Egri]

Fix for crash in theme engine when loading application specific theme file in an app having a Popover instantiated.

Fix for crash in theme engine when loading application specific theme file in an app having a Popover instantiated.

[Zsombor Egri (zsombi)]

Not ready yet, posted for testing purpose.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:488
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/53

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/53/rebuild

review: Approve (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/fix-style-lookup-crash]

489. By Zsombor Egri on 2013-05-15

test case extended to reproduce the crash on nexus 10

490. By Zsombor Egri on 2013-05-15

fix style cleanup

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:489
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/54/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/54
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/54

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:490
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/55

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/55/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Tested with reverted media-player app workarounds.

[lp:~zsombi/ubuntu-ui-toolkit/fix-style-lookup-crash]

491. By Zsombor Egri on 2013-05-15

link to the bug added

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:491
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/56

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/56/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Ready for review. Tested with rolled back workaround on media-player application on Nexus 10.

review: Approve

=== modified file 'modules/Ubuntu/Components/plugin/itemstyleattached.cpp'
--- modules/Ubuntu/Components/plugin/itemstyleattached.cpp	2013-05-07 10:55:24 +0000
+++ modules/Ubuntu/Components/plugin/itemstyleattached.cpp	2013-05-15 06:49:24 +0000
@@ -358,8 +358,13 @@
 
     // delete style also if there is an owner set to it
     if (!customStyle || style->owner()) {
-        delete style;
+        // reset style object before we delete it, themed animations may get changed
+        // during the style deletion which will cause invalid pointer operations
+        // in style bindings cleanup
+        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1175394
+        QObject *object = style;
         style = 0;
+        delete object;
     }
 }
 

=== modified file 'modules/Ubuntu/Components/plugin/ucstyle.cpp'
--- modules/Ubuntu/Components/plugin/ucstyle.cpp	2013-05-01 19:19:22 +0000
+++ modules/Ubuntu/Components/plugin/ucstyle.cpp	2013-05-15 06:49:24 +0000
@@ -46,7 +46,7 @@
 UCStyle::~UCStyle()
 {
     // we shouldn't have bindings by this time, but just in case...
-    QHashIterator<QString, QQmlProperty> i(m_bindings);
+    QMutableHashIterator<QString, QQmlProperty> i(m_bindings);
     while (i.hasNext()) {
         i.next();
         unbind(i.key());

=== added file 'tests/unit/tst_theme_engine/StyleLookupCrash.qml'
--- tests/unit/tst_theme_engine/StyleLookupCrash.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_theme_engine/StyleLookupCrash.qml	2013-05-15 06:49:24 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Item {
+    Popover {
+    }
+    Slider{
+    }
+    Component.onCompleted: Theme.loadTheme(Qt.resolvedUrl("StyleLookupCrash.qmltheme"))
+}

=== added file 'tests/unit/tst_theme_engine/StyleLookupCrash.qmltheme'
--- tests/unit/tst_theme_engine/StyleLookupCrash.qmltheme	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_theme_engine/StyleLookupCrash.qmltheme	2013-05-15 06:49:24 +0000
@@ -0,0 +1,1 @@
+@import url(system:/Ambiance/qmltheme/default.qmltheme);

=== modified file 'tests/unit/tst_theme_engine/tst_theme_engine.pro'
--- tests/unit/tst_theme_engine/tst_theme_engine.pro	2013-04-30 22:38:24 +0000
+++ tests/unit/tst_theme_engine/tst_theme_engine.pro	2013-05-15 06:49:24 +0000
@@ -9,4 +9,6 @@
     SelectorTest.qml \
     InheritanceTest.qml \
     MemoryCleanup.qml \
-    CustomStyles.qml
+    CustomStyles.qml \
+    StyleLookupCrash.qml \
+    StyleLookupCrash.qmltheme

=== modified file 'tests/unit/tst_theme_engine/tst_theme_enginetest.cpp'
--- tests/unit/tst_theme_engine/tst_theme_enginetest.cpp	2013-05-07 10:55:24 +0000
+++ tests/unit/tst_theme_engine/tst_theme_enginetest.cpp	2013-05-15 06:49:24 +0000
@@ -67,6 +67,7 @@
     void testCase_inheritance();
     void testCase_MemoryCleanup();
     void testCase_CustomTheme();
+    void testCase_styleLookupCrash();
 private:
     bool check_properties(QObject *style, const QString &properties, bool xfail);
 private:
@@ -370,6 +371,13 @@
     delete root;
 }
 
+void tst_ThemeEngine::testCase_styleLookupCrash()
+{
+    QQuickItem *root = loadTest("StyleLookupCrash.qml");
+
+    delete root;
+}
+
 QTEST_MAIN(tst_ThemeEngine)
 
 #include "tst_theme_enginetest.moc"