Merge lp:~fboucault/unity-2d/dash_no_unload_page into lp:unity-2d

Proposed by Florian Boucault
Status: Merged
Approved by: Gerry Boland
Approved revision: 807
Merged at revision: 822
Proposed branch: lp:~fboucault/unity-2d/dash_no_unload_page
Merge into: lp:unity-2d
Diff against target: 39 lines (+0/-29)
1 file modified
places/dash.qml (+0/-29)
To merge this branch: bzr merge lp:~fboucault/unity-2d/dash_no_unload_page
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Lohith D Shivamurthy Pending
Review via email: mp+84672@code.launchpad.net

Description of the change

[dash] Do not unload the current page when exiting it. That does not change
the user experience at all and improves the speed at which the dash opens
up in a number of cases.

Reference: https://bugs.launchpad.net/unity-2d/+bug/881756

The workarounds crashers in the code removed by this change were still valid.

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote :

"The workarounds crashers in the code removed by this change were still valid." means that I tested that without the workarounds the crashers were still occuring.

The first one is fixed in Qt 4.8 so we won't have to worry about it for much longer:
https://bugs.launchpad.net/ubuntu/+source/unity-2d/+bug/817896
https://bugreports.qt.nokia.com/browse/QTBUG-20692

The second one is probably a crasher happening because of one of the Ubuntu patches we carry since upstream cannot reproduce it:
https://bugs.launchpad.net/ubuntu/+source/unity-2d/+bug/836498
https://bugreports.qt.nokia.com/browse/QTBUG-22776

Revision history for this message
Gerry Boland (gerboland) wrote :

I don't approve of removing the workarounds until they're unnecessary. I suggest that we hold off merging this patch until Qt4.8 is introduced, and we investigation the root cause of the second crasher (RTL).

Revision history for this message
Florian Boucault (fboucault) wrote :

Well they are unnecessary because the code that needed them is also removed by the merge request.

Revision history for this message
Gerry Boland (gerboland) wrote :

Ah ok, I misunderstood what you were saying. Performance is improved visibly, this is great. Thank you

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'places/dash.qml'
--- places/dash.qml 2011-11-29 12:13:27 +0000
+++ places/dash.qml 2011-12-06 21:08:24 +0000
@@ -50,35 +50,6 @@
50 DashDeclarativeView.DesktopMode : DashDeclarativeView.FullScreenMode50 DashDeclarativeView.DesktopMode : DashDeclarativeView.FullScreenMode
51 }51 }
5252
53 /* Unload the current page when closing the dash */
54 Connections {
55 target: dashView
56 onActiveChanged: {
57 if (!dashView.active) {
58 /* FIXME: currentPage needs to stop pointing to pageLoader.item
59 that is about to be invalidated otherwise a crash
60 occurs because SearchEntry has a binding that refers
61 to currentPage and tries to access it.
62 Ref.: https://bugs.launchpad.net/ubuntu/+source/unity-2d/+bug/817896
63 https://bugreports.qt.nokia.com/browse/QTBUG-20692
64 */
65 deactivateActiveLens()
66 currentPage = undefined
67 // Delay the following instruction by 1 millisecond using a
68 // timer. This is enough to work around a crash that happens
69 // when the layout is mirrored (RTL locales). See QTBUG-22776
70 // for details.
71 //pageLoader.source = ""
72 delayPageLoaderReset.restart()
73 }
74 }
75 }
76 Timer {
77 id: delayPageLoaderReset
78 interval: 1
79 onTriggered: pageLoader.source = ""
80 }
81
82 function activatePage(page) {53 function activatePage(page) {
83 /* Always give the focus to the search entry when switching pages */54 /* Always give the focus to the search entry when switching pages */
84 search_entry.focus = true55 search_entry.focus = true

Subscribers

People subscribed via source and target branches