Merge pull request #18100 from timdream/window-homescreen-restart-v1.3t

Bug 992749 - Prevent homescreen from being restarted when visibility state is noy synced yet, r=alive

apps/system/js/homescreen_window.js

@@ -36,6 +36,7 @@
   HomescreenWindow.prototype.render = function hw_render() {
     // reset transition state.
     this._transitionState = 'closed';
+    this._selfVisibilityState = 'background';
     this.publish('willrender');
     this.containerElement.insertAdjacentHTML('beforeend', this.view());
     this.browser = new BrowserFrame(this.browser_config);
@@ -122,8 +123,10 @@
 
     // If we're displayed, restart immediately.
     this.debug(this._visibilityState);
-    if (this._visibilityState == 'foreground' ||
-        this.element.classList.contains('active')) {
+    this.debug(this._selfVisibilityState);
+    this.debug(AttentionScreen.isVisible());
+    if (this._selfVisibilityState == 'foreground' &&
+        !AttentionScreen.isVisible()) {
       this.kill();
 
       // XXX workaround bug 810431.

apps/system/js/window.js

@@ -66,6 +66,16 @@
    */
   AppWindow.prototype._visibilityState = 'foreground';
 
+  /**
+   * Represent the current page visibility state from system app side,
+   * i.e. what is currently visible. Possible value:
+   * 'foreground': setVisible(true)
+   * 'background': setVisible(false)
+   *
+   * Default value is background.
+   */
+  AppWindow.prototype._selfVisibilityState = 'background';
+
   /**
    * The rotating degree of current frame.
    */
@@ -106,10 +116,12 @@
     function aw_setVisible(visible, screenshotIfInvisible) {
       this.debug('set visibility -> ', visible);
       if (visible) {
+        this._selfVisibilityState = 'foreground';
         this.frame.removeAttribute('aria-hidden');
         this._screenshotOverlayState = 'frame';
         this._showFrame();
       } else {
+        this._selfVisibilityState = 'background';
         this.frame.setAttribute('aria-hidden', 'true');
         if (screenshotIfInvisible) {
           this._screenshotOverlayState = 'screenshot';

apps/system/test/unit/homescreen_window_test.js

@@ -183,7 +183,7 @@ suite('system/HomescreenWindow', function() {
 
       test('Homescreen is crashed at foreground:' +
           'rerender right away.', function() {
-        homescreenWindow._visibilityState = 'foreground';
+        homescreenWindow._selfVisibilityState = 'foreground';
         homescreenWindow.restart();
         assert.isTrue(stubKill.called);
         clock.tick(1);
@@ -192,7 +192,7 @@ suite('system/HomescreenWindow', function() {
       });
 
       test('Homescreen is crashed at background: killed', function() {
-        homescreenWindow._visibilityState = 'background';
+        homescreenWindow._selfVisibilityState = 'background';
         homescreenWindow.restart();
         assert.isTrue(stubKill.called);
       });