Merge lp:~osomon/webbrowser-app/session-restore-tab-load into lp:webbrowser-app

[Olivier Tilloy]

Only load the current tab when the session is restored.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1457
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/501/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/503/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/503
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/495/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/495/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/501/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-05-09 15:16:46 +0000
+++ src/app/webbrowser/Browser.qml	2016-05-19 09:02:09 +0000
@@ -1675,7 +1675,13 @@
             store(JSON.stringify({tabs: tabs, currentIndex: publicTabsModel.currentIndex}))
         }
 
+        property bool restoring: false
         function restore() {
+            restoring = true
+            _doRestore()
+            restoring = false
+        }
+        function _doRestore() {
             if (!locked) {
                 return
             }
@@ -1690,11 +1696,11 @@
                 if (tabs) {
                     for (var i = 0; i < Math.min(tabs.length, browser.maxTabsToRestore); ++i) {
                         var tab = createTabFromState(tabs[i])
-                        internal.addTab(tab, i == 0)
+                        internal.addTab(tab, false)
                     }
                 }
                 if ('currentIndex' in state) {
-                    internal.switchToTab(state.currentIndex, true)
+                    internal.switchToTab(state.currentIndex, false)
                 }
             }
         }
@@ -1814,7 +1820,9 @@
             if (tabsModel.count == 0) {
                 browser.openUrlInNewTab(settings.homepage, true, false)
             }
-            tabsModel.currentTab.load()
+            if (!delayedTabSwitcher.running) {
+                tabsModel.currentTab.load()
+            }
             if (!tabsModel.currentTab.url.toString() && !tabsModel.currentTab.restoreState) {
                 internal.maybeFocusAddressBar()
             }
@@ -1876,7 +1884,7 @@
     }
 
     Connections {
-        target: tabsModel
+        target: session.restoring ? null : tabsModel
         onCurrentIndexChanged: {
             // In narrow mode, the tabslist is a stack:
             // the current tab is always at the top.