Unity 8

Merge lp:~aacid/unity8/conciergeModeOptimization into lp:unity8

  1. conciergeModeOptimization
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 2214
Merged at revision: 2413
Proposed branch: lp:~aacid/unity8/conciergeModeOptimization
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/cardArtShapeStyleOnCompileTime
Diff against target: 194 lines (+16/-41)
11 files modified
plugins/Dash/CardCreator.js (+16/-17)
tests/plugins/Dash/cardcreator/1.res (+0/-1)
tests/plugins/Dash/cardcreator/1.res.cardcreator (+0/-1)
tests/plugins/Dash/cardcreator/11.res (+0/-1)
tests/plugins/Dash/cardcreator/11.res.cardcreator (+0/-1)
tests/plugins/Dash/cardcreator/12.res (+0/-1)
tests/plugins/Dash/cardcreator/12.res.cardcreator (+0/-1)
tests/plugins/Dash/cardcreator/3.res (+0/-1)
tests/plugins/Dash/cardcreator/3.res.cardcreator (+0/-1)
tests/plugins/Dash/cardcreator/5.res (+0/-8)
tests/plugins/Dash/cardcreator/5.res.cardcreator (+0/-8)
To merge this branch: bzr merge lp:~aacid/unity8/conciergeModeOptimization
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Andrea Cimitan (community) Approve
Review via email: mp+288106@code.launchpad.net

Commit message

Concierge mode generated code optimization

No need to create a shape that will always be non visible

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
Prereq

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2213
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/600/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/334
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/334
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/334
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/791
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/808
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/808
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/805
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/805/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/805
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/805/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/805
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/805/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/805
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/805/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/805
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/805/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/805
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/805/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/600/rebuild

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/conciergeModeOptimization updated
2214. By Albert Astals Cid

Merge

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2214
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/705/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/929
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/945/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/943/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/943/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/943/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/943/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/943/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/943/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/705/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2214
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/711/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/935
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/951/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/951/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/948/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/948/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/948/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/948/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/948/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/948/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/711/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2214
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/722/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/950
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/968/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/968
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/966/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/966/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/966/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/966/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/966
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/966/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/722/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
not related
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2214
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/810/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1057
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1072/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1072/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1070/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1070/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1070/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1070/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1070/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1070/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/810/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2214
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/827/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1074
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1089
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1089
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1087
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1087/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1087/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1087
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1087/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1087/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1087
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1087/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1087/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/827/rebuild

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/conciergeModeOptimization updated
2215. By Albert Astals Cid

Merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/CardCreator.js'
2--- plugins/Dash/CardCreator.js 2016-05-09 08:43:49 +0000
3+++ plugins/Dash/CardCreator.js 2016-05-09 08:43:49 +0000
4@@ -59,21 +59,17 @@
5 } \n\
6 }\n';
7
8-// %1 is the visible code
9-// %2 is the aspect of the UbuntuShape
10+// %1 is the aspect of the UbuntuShape
11 var kArtUbuntuShapeCode = 'UbuntuShape { \n\
12 anchors.fill: parent; \n\
13- visible: %1; \n\
14 source: artImage; \n\
15 sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\
16 radius: "medium"; \n\
17- aspect: %2; \n\
18+ aspect: %1; \n\
19 }';
20
21-// %1 is the visible code
22 var kArtProportionalShapeCode = 'ProportionalShape { \n\
23 anchors.fill: parent; \n\
24- visible: %1; \n\
25 source: artImage; \n\
26 aspect: UbuntuShape.DropShadow; \n\
27 }';
28@@ -520,18 +516,21 @@
29 fallbackURICode = 'decodeURI("%1")'.arg(fallback);
30 }
31 var artShapeHolderShapeCode;
32- if (artShapeStyle === "icon") {
33- artShapeHolderShapeCode = kArtProportionalShapeCode.arg(isConciergeMode ? "false" : "true");
34+ if (!isConciergeMode) {
35+ if (artShapeStyle === "icon") {
36+ artShapeHolderShapeCode = kArtProportionalShapeCode;
37+ } else {
38+ var artShapeHolderShapeAspect;
39+ switch (artShapeStyle) {
40+ case "inset": artShapeHolderShapeAspect = "UbuntuShape.Inset"; break;
41+ case "shadow": artShapeHolderShapeAspect = "UbuntuShape.DropShadow"; break;
42+ default:
43+ case "flat": artShapeHolderShapeAspect = "UbuntuShape.Flat"; break;
44+ }
45+ artShapeHolderShapeCode = kArtUbuntuShapeCode.arg(artShapeHolderShapeAspect);
46+ }
47 } else {
48- var artShapeHolderShapeAspect;
49- switch (artShapeStyle) {
50- case "inset": artShapeHolderShapeAspect = "UbuntuShape.Inset"; break;
51- case "shadow": artShapeHolderShapeAspect = "UbuntuShape.DropShadow"; break;
52- default:
53- case "flat": artShapeHolderShapeAspect = "UbuntuShape.Flat"; break;
54- }
55- artShapeHolderShapeCode = kArtUbuntuShapeCode.arg(isConciergeMode ? "false" : "true")
56- .arg(artShapeHolderShapeAspect);
57+ artShapeHolderShapeCode = "";
58 }
59 code += kArtShapeHolderCode.arg(artAnchors)
60 .arg(widthCode)
61
62=== modified file 'tests/plugins/Dash/cardcreator/1.res'
63--- tests/plugins/Dash/cardcreator/1.res 2016-05-09 08:43:49 +0000
64+++ tests/plugins/Dash/cardcreator/1.res 2016-05-09 08:43:49 +0000
65@@ -31,7 +31,6 @@
66 readonly property alias image: artImage;
67 UbuntuShape {
68 anchors.fill: parent;
69- visible: true;
70 source: artImage;
71 sourceFillMode: UbuntuShape.PreserveAspectCrop;
72 radius: "medium";
73
74=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
75--- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-05-09 08:43:49 +0000
76+++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-05-09 08:43:49 +0000
77@@ -30,7 +30,6 @@
78 readonly property alias image: artImage;
79 UbuntuShape {
80 anchors.fill: parent;
81- visible: true;
82 source: artImage;
83 sourceFillMode: UbuntuShape.PreserveAspectCrop;
84 radius: "medium";
85
86=== modified file 'tests/plugins/Dash/cardcreator/11.res'
87--- tests/plugins/Dash/cardcreator/11.res 2016-05-09 08:43:49 +0000
88+++ tests/plugins/Dash/cardcreator/11.res 2016-05-09 08:43:49 +0000
89@@ -69,7 +69,6 @@
90 readonly property alias image: artImage;
91 UbuntuShape {
92 anchors.fill: parent;
93- visible: true;
94 source: artImage;
95 sourceFillMode: UbuntuShape.PreserveAspectCrop;
96 radius: "medium";
97
98=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
99--- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-05-09 08:43:49 +0000
100+++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-05-09 08:43:49 +0000
101@@ -68,7 +68,6 @@
102 readonly property alias image: artImage;
103 UbuntuShape {
104 anchors.fill: parent;
105- visible: true;
106 source: artImage;
107 sourceFillMode: UbuntuShape.PreserveAspectCrop;
108 radius: "medium";
109
110=== modified file 'tests/plugins/Dash/cardcreator/12.res'
111--- tests/plugins/Dash/cardcreator/12.res 2016-05-09 08:43:49 +0000
112+++ tests/plugins/Dash/cardcreator/12.res 2016-05-09 08:43:49 +0000
113@@ -31,7 +31,6 @@
114 readonly property alias image: artImage;
115 UbuntuShape {
116 anchors.fill: parent;
117- visible: true;
118 source: artImage;
119 sourceFillMode: UbuntuShape.PreserveAspectCrop;
120 radius: "medium";
121
122=== modified file 'tests/plugins/Dash/cardcreator/12.res.cardcreator'
123--- tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-05-09 08:43:49 +0000
124+++ tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-05-09 08:43:49 +0000
125@@ -30,7 +30,6 @@
126 readonly property alias image: artImage;
127 UbuntuShape {
128 anchors.fill: parent;
129- visible: true;
130 source: artImage;
131 sourceFillMode: UbuntuShape.PreserveAspectCrop;
132 radius: "medium";
133
134=== modified file 'tests/plugins/Dash/cardcreator/3.res'
135--- tests/plugins/Dash/cardcreator/3.res 2016-05-09 08:43:49 +0000
136+++ tests/plugins/Dash/cardcreator/3.res 2016-05-09 08:43:49 +0000
137@@ -31,7 +31,6 @@
138 readonly property alias image: artImage;
139 ProportionalShape {
140 anchors.fill: parent;
141- visible: true;
142 source: artImage;
143 aspect: UbuntuShape.DropShadow;
144 }
145
146=== modified file 'tests/plugins/Dash/cardcreator/3.res.cardcreator'
147--- tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-05-09 08:43:49 +0000
148+++ tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-05-09 08:43:49 +0000
149@@ -30,7 +30,6 @@
150 readonly property alias image: artImage;
151 ProportionalShape {
152 anchors.fill: parent;
153- visible: true;
154 source: artImage;
155 aspect: UbuntuShape.DropShadow;
156 }
157
158=== modified file 'tests/plugins/Dash/cardcreator/5.res'
159--- tests/plugins/Dash/cardcreator/5.res 2016-05-09 08:43:49 +0000
160+++ tests/plugins/Dash/cardcreator/5.res 2016-05-09 08:43:49 +0000
161@@ -29,14 +29,6 @@
162 objectName: "artShape";
163 visible: image.status == Image.Ready;
164 readonly property alias image: artImage;
165- UbuntuShape {
166- anchors.fill: parent;
167- visible: false;
168- source: artImage;
169- sourceFillMode: UbuntuShape.PreserveAspectCrop;
170- radius: "medium";
171- aspect: UbuntuShape.DropShadow;
172- }
173 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
174 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : 1;
175 Component.onCompleted: { updateWidthHeightBindings(); }
176
177=== modified file 'tests/plugins/Dash/cardcreator/5.res.cardcreator'
178--- tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-05-09 08:43:49 +0000
179+++ tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-05-09 08:43:49 +0000
180@@ -28,14 +28,6 @@
181 objectName: "artShape";
182 visible: image.status == Image.Ready;
183 readonly property alias image: artImage;
184- UbuntuShape {
185- anchors.fill: parent;
186- visible: false;
187- source: artImage;
188- sourceFillMode: UbuntuShape.PreserveAspectCrop;
189- radius: "medium";
190- aspect: UbuntuShape.DropShadow;
191- }
192 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
193 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : 1;
194 Component.onCompleted: { updateWidthHeightBindings(); }

Subscribers

People subscribed via source and target branches