Merge pull request mozilla-b2g#23404 from alivedise/bugzilla/1039955/…

…circular-activity Bug 1039955 - Fix direct circular activity, r=etienne (cherry picked from commit 3f59dcd)
etiennesegonzac · Aug 29, 2014 · 58f6b58 · 58f6b58
1 parent e466549
commit 58f6b58
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/apps/system/js/app_window_manager.js b/apps/system/js/app_window_manager.js
@@ -656,8 +656,12 @@
       var caller;
       var callee = this.getApp(config.origin);
       caller = this._activeApp.getTopMostWindow();
-      callee.callerWindow = caller;
-      caller.calleeWindow = callee;
+      if (caller.getBottomMostWindow() === callee) {
+        callee.frontWindow.kill();
+      } else {
+        callee.callerWindow = caller;
+        caller.calleeWindow = callee;
+      }
     },
 
     debug: function awm_debug() {

diff --git a/apps/system/test/unit/app_window_manager_test.js b/apps/system/test/unit/app_window_manager_test.js
@@ -758,7 +758,6 @@ suite('system/AppWindowManager', function() {
         // callee is app7, caller is app2
         injectRunningApps(app7);
         AppWindowManager._activeApp = app1;
-        fakeAppConfig.parentApp = '';
         this.sinon.stub(app1, 'getTopMostWindow').returns(app2);
 
         AppWindowManager.linkWindowActivity(fakeAppConfig);
@@ -767,6 +766,25 @@ suite('system/AppWindowManager', function() {
         assert.deepEqual(app7.callerWindow, app2);
         assert.isFalse(homescreenLauncher.getHomescreen.called);
     });
+
+    test('If there is a direct circular activity, ' +
+          'close the frontwindow to reveal the callee',
+      function() {
+        // callee is app1, caller is app3(a front window)
+        injectRunningApps(app1);
+        AppWindowManager._activeApp = app1;
+        fakeAppConfig.parentApp = '';
+        app1.frontWindow = app3;
+        this.sinon.stub(app1, 'getTopMostWindow').returns(app3);
+        this.sinon.stub(app3, 'getBottomMostWindow').returns(app1);
+        var stubKill = this.sinon.stub(app3, 'kill');
+
+        AppWindowManager.linkWindowActivity(fakeAppConfig1);
+
+        assert.isTrue(stubKill.called);
+        assert.isUndefined(app1.callerWindow);
+        app1.frontWindow = null;
+    });
   });
 
   test('getApp', function() {

diff --git a/apps/system/test/unit/mock_app_window.js b/apps/system/test/unit/mock_app_window.js
@@ -75,6 +75,7 @@
     modifyURLatBackground: function() {},
     getFrameForScreenshot: function() { return this.browser.element; },
     getTopMostWindow: function() { return this; },
+    getBottomMostWindow: function() { return this; },
     determineClosingRotationDegree: function() { return 0; },
     isTransitioning: function() { return false; },
     calibratedHeight: function() { return false; },