2259142 · unity8 · git.iko.soy

plugins/Unity/Indicators/CachedUnityMenuModel.qml−16

compare with xenial

unifiedsplit

@@ -45,22 +45,6 @@ Item {

45 return newModel;

46 }

47

48− QtObject {

49− id: d

50− property UnityMenuModel oldModel: null

51− }

52−

53− onModelChanged: {

54− if (model !== d.oldModel) {

55− if (d.oldModel) Indicators.UnityMenuModelCache.deref(d.oldModel);

56− if (model) Indicators.UnityMenuModelCache.ref(model);

57− }

58− d.oldModel = model;

59− }

60− Component.onDestruction: {

61− if (model) Indicators.UnityMenuModelCache.deref(model);

62− }

63−

64 Component {

48 Component {

65 id: modelComponent

49 id: modelComponent

66 UnityMenuModel {}

50 UnityMenuModel {}

plugins/Unity/Indicators/unitymenumodelcache.cpp+6−21

@@ -30,7 +30,6 @@ UnityMenuModelCache::UnityMenuModelCache(QObject* parent)

30

31UnityMenuModelCache::~UnityMenuModelCache()

32{

33− qDeleteAll(m_menuModels);

34}

33}

35

34

36UnityMenuModel* UnityMenuModelCache::model(const QString& path) const

35UnityMenuModel* UnityMenuModelCache::model(const QString& path) const

@@ -40,31 +39,17 @@ UnityMenuModel* UnityMenuModelCache::model(const QString& path) const

40

39

41void UnityMenuModelCache::registerModel(const QString& path, UnityMenuModel* menuModel)

40void UnityMenuModelCache::registerModel(const QString& path, UnityMenuModel* menuModel)

42{

41{

43− QQmlEngine::setObjectOwnership(menuModel, QQmlEngine::CppOwnership);

44− menuModel->setParent(this);

45 m_menuModels[path] = menuModel;

42 m_menuModels[path] = menuModel;

46−}

47

43

48−void UnityMenuModelCache::ref(UnityMenuModel* menuModel)

44+ connect(menuModel, &QObject::destroyed, this, [menuModel, this](QObject*) {

49−{

50− m_refs[menuModel] = m_refs.value(menuModel, 0) + 1;

51−}

52−

53−void UnityMenuModelCache::deref(UnityMenuModel* menuModel)

54−{

55− if (m_refs.contains(menuModel)) {

56− if (--m_refs[menuModel] == 0) {

57− m_refs.remove(menuModel);

58− QList<QString> keys = m_menuModels.keys(menuModel);

45+ QList<QString> keys = m_menuModels.keys(menuModel);

59− Q_FOREACH(const QString& key, keys) {

46+ Q_FOREACH(const QString& key, keys) {

60− m_menuModels.remove(key);

47+ m_menuModels.remove(key);

61− }

62− menuModel->deleteLater();

63 }

48 }

64− }

49+ });

65}

50}

66

51

67bool UnityMenuModelCache::contains(UnityMenuModel* menuModel)

52bool UnityMenuModelCache::contains(UnityMenuModel* menuModel)

68{

53{

69− return m_refs.contains(menuModel);

54+ return !m_menuModels.keys(menuModel).isEmpty();

70}

55}

plugins/Unity/Indicators/unitymenumodelcache.h−4

@@ -37,14 +37,10 @@ public:

37 Q_INVOKABLE UnityMenuModel* model(const QString& path) const;

38 Q_INVOKABLE void registerModel(const QString& path, UnityMenuModel* menuModel);

39

40− Q_INVOKABLE void ref(UnityMenuModel* menuModel);

41− Q_INVOKABLE void deref(UnityMenuModel* menuModel);

42−

43 Q_INVOKABLE bool contains(UnityMenuModel* menuModel);

40 Q_INVOKABLE bool contains(UnityMenuModel* menuModel);

44

41

45private:

42private:

46 QHash<QString, UnityMenuModel*> m_menuModels;

43 QHash<QString, UnityMenuModel*> m_menuModels;

47− QHash<UnityMenuModel*, uint> m_refs;

48};

44};

49

45

50#endif // UNITYMENUMODELCACHE_H

46#endif // UNITYMENUMODELCACHE_H

qml/Shell.qml−1

@@ -648,5 +648,4 @@ Item {

648 }

649 }

650 }

651−

652}

651}

tests/qmltests/CMakeLists.txt+1−1

@@ -72,7 +72,7 @@ add_qml_test(Panel Panel)

72add_qml_test(Panel SearchIndicator)

73add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

74add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

75−add_qml_test(Panel/Indicators CachedUnityMenuModel IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS} ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

75+add_qml_test(Panel/Indicators CachedUnityMenuModel IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/utils/modules)

76# These MenuItemFactory tests need the test/mocks/ to come before plugins/

77add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

78add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml−53

@@ -50,9 +50,6 @@ Item {

50 });

51

52 verify(cachedObject.model !== cachedObject2.model);

53−

54− cachedObject.destroy();

55− cachedObject2.destroy();

56 }

53 }

57

54

58 function test_createSame() {

55 function test_createSame() {

@@ -71,53 +68,6 @@ Item {

71 });

68 });

72

69

73 verify(cachedObject.model === cachedObject2.model);

70 verify(cachedObject.model === cachedObject2.model);

74−

75− cachedObject.destroy();

76− cachedObject2.destroy();

77− }

78−

79− function test_destroyAllDeletesModel() {

80− var cachedObject = model.createObject(root,

81− {

82− "busName": "com.canonical.test1",

83− "menuObjectPath": "com/canonical/test1",

84− "actionsObjectPath": "com/canonical/test1/actions"

85− });

86−

87− var cachedObject2 = model.createObject(root,

88− {

89− "busName": "com.canonical.test1",

90− "menuObjectPath": "com/canonical/test1",

91− "actionsObjectPath": "com/canonical/test1/actions"

92− });

93−

94− var menuModel = cachedObject.model;

95− cachedObject.destroy();

96− cachedObject2.destroy();

97− tryCompareFunction(function() { return Indicators.UnityMenuModelCache.contains(menuModel) }, false);

98− }

99−

100− function test_destroyPartialKeepsModel() {

101− var cachedObject = model.createObject(root,

102− {

103− "busName": "com.canonical.test1",

104− "menuObjectPath": "com/canonical/test1",

105− "actionsObjectPath": "com/canonical/test1/actions"

106− });

107−

108− var cachedObject2 = model.createObject(root,

109− {

110− "busName": "com.canonical.test1",

111− "menuObjectPath": "com/canonical/test1",

112− "actionsObjectPath": "com/canonical/test1/actions"

113− });

114−

115− var menuModel = cachedObject.model;

116− cachedObject.destroy();

117− wait(1);

118− compare(Indicators.UnityMenuModelCache.contains(menuModel), true);

119−

120− cachedObject2.destroy();

121 }

71 }

122

72

123 // Tests that changing cached model data does not change the model path of others

73 // Tests that changing cached model data does not change the model path of others

@@ -141,9 +91,6 @@ Item {

141 compare(cachedObject2.model.menuObjectPath, "com/canonical/test1");

91 compare(cachedObject2.model.menuObjectPath, "com/canonical/test1");

142

92

143 verify(cachedObject.model !== cachedObject2.model);

93 verify(cachedObject.model !== cachedObject2.model);

144−

145− cachedObject.destroy();

146− cachedObject2.destroy();

147 }

94 }

148 }

95 }

149}

96}