Merge pull request #21041 from vingtetun/ttl-view.events

Bug 1028892 - Update TTL View to support new transition events, and make...

apps/system/js/homescreen_window.js

@@ -16,6 +16,7 @@
     this.setBrowserConfig(manifestURL);
     this.render();
     this.publish('created');
+    this.createdTime = this.launchTime = Date.now();
     return this;
   };
 
@@ -120,6 +121,7 @@
   HomescreenWindow.prototype._handle_mozbrowsererror =
     function hw__handle_mozbrowsererror(evt) {
       if (evt.detail.type == 'fatal') {
+        this.loaded = false;
         this.publish('crashed');
         this.restart();
       }

apps/system/js/ttlview.js

@@ -3,6 +3,12 @@
 
 (function(exports) {
 
+  var targets = [
+    'homescreen',
+    'app',
+    'activity'
+  ];
+
   /**
    * TTLView measures and displays startup time as measured by "first paint".
    * The load time is displayed in ms next to the type of load event.
@@ -44,10 +50,10 @@
         this.element.style.visibility = 'hidden';
       }
 
-      window.removeEventListener('appwillopen', this);
-      window.removeEventListener('apploadtime', this);
-      window.removeEventListener('activitywillopen', this);
-      window.removeEventListener('activityloadtime', this);
+      targets.forEach(function listen(target) {
+        window.removeEventListener(target + 'opening', this);
+        window.removeEventListener(target + 'loadtime', this);
+      }, this);
     },
 
     /**
@@ -61,12 +67,10 @@
       this.element.style.visibility = 'visible';
 
       // this is fired when the app launching is initialized
-      window.addEventListener('appwillopen', this);
-      window.addEventListener('apploadtime', this);
-
-      // this is to calculate the load time of inline activity
-      window.addEventListener('activitywillopen', this);
-      window.addEventListener('activityloadtime', this);
+      targets.forEach(function listen(target) {
+        window.addEventListener(target + 'opening', this);
+        window.addEventListener(target + 'loadtime', this);
+      }, this);
     },
 
     /**
@@ -91,13 +95,15 @@
      */
     handleEvent: function(evt) {
       switch (evt.type) {
+        case 'homescreenloadtime':
         case 'apploadtime':
         case 'activityloadtime':
           this.updateLoadtime(evt.detail.time, evt.detail.type);
           break;
 
-        case 'appwillopen':
-        case 'activitywillopen':
+        case 'homescreenopening':
+        case 'appopening':
+        case 'activityopening':
           this.resetLoadtime();
           break;
       }

apps/system/test/unit/ttlview_test.js

@@ -44,8 +44,18 @@ suite('system/TTLView', function() {
 
   suite('hide', function() {
     test('removes listeners', function() {
-      var events = ['appwillopen', 'apploadtime',
-        'activitywillopen', 'activityloadtime'];
+      var targets = [
+        'homescreen',
+        'app',
+        'activity'
+      ];
+
+      var events = [];
+      targets.forEach(function listen(target) {
+        events.push(target + 'opening');
+        events.push(target + 'loadtime');
+      });
+
       var removeStub = this.sinon.stub(window, 'removeEventListener');
       subject.hide();
       events.forEach(function(evt) {
@@ -56,8 +66,18 @@ suite('system/TTLView', function() {
 
   suite('show', function() {
     test('adds listeners', function() {
-      var events = ['appwillopen', 'apploadtime',
-        'activitywillopen', 'activityloadtime'];
+      var targets = [
+        'homescreen',
+        'app',
+        'activity'
+      ];
+
+      var events = [];
+      targets.forEach(function listen(target) {
+        events.push(target + 'opening');
+        events.push(target + 'loadtime');
+      });
+
       var addEventStub = this.sinon.stub(window, 'addEventListener');
       subject.show();
       events.forEach(function(evt) {
@@ -68,7 +88,17 @@ suite('system/TTLView', function() {
 
   suite('handleEvent', function() {
     test('updateLoadtime events', function() {
-      var events = ['apploadtime', 'activityloadtime'];
+      var targets = [
+        'homescreen',
+        'app',
+        'activity'
+      ];
+
+      var events = [];
+      targets.forEach(function listen(target) {
+        events.push(target + 'loadtime');
+      });
+
       var updateStub = this.sinon.stub(subject, 'updateLoadtime');
       events.forEach(function(evt, i) {
         subject.handleEvent({
@@ -83,7 +113,17 @@ suite('system/TTLView', function() {
     });
 
     test('resetLoadtime events', function() {
-      var events = ['appwillopen', 'activitywillopen'];
+      var targets = [
+        'homescreen',
+        'app',
+        'activity'
+      ];
+
+      var events = [];
+      targets.forEach(function listen(target) {
+        events.push(target + 'opening');
+      });
+
       events.forEach(function(evt) {
         var resetStub = this.sinon.stub(subject, 'resetLoadtime');
         subject.handleEvent({