Merge pull request #29624 from eliperelman/bug-1112119-camera

Bug 1112119 - Removing legacy performance tests from Camera

apps/camera/index.html

@@ -24,7 +24,6 @@
     <!-- <script defer src="/shared/js/l10n.js"></script> -->
     <!-- <script defer src="/shared/js/l10n_date.js"></script> -->
     <!-- <script defer src="/shared/js/async_storage.js"></script> -->
-    <!-- <script defer src="/shared/js/performance_testing_helper.js"></script> -->
     <!-- <script defer src="/shared/js/media/jpeg_metadata_parser.js"></script> -->
     <!-- <script defer src="/shared/js/media/get_video_rotation.js"></script> -->
     <!-- <script defer src="/shared/js/media/video_player.js"></script> -->

apps/camera/js/app.js

@@ -1,9 +1,6 @@
 define(function(require, exports, module) {
 'use strict';
 
-// For perf-measurement related utilities
-require('performance-testing-helper');
-
 /**
  * Dependencies
  */
@@ -79,16 +76,14 @@ App.prototype.boot = function() {
   this.initializeViews();
   this.runControllers();
 
-  // PERFORMANCE EVENT (1): moz-chrome-dom-loaded
+  // PERFORMANCE MARKER (1): navigationLoaded
   // Designates that the app's *core* chrome or navigation interface
   // exists in the DOM and is marked as ready to be displayed.
-  // PERFORMANCE EVENT (2): moz-chrome-interactive
+  // PERFORMANCE MARKER (2): navigationInteractive
   // Designates that the app's *core* chrome or navigation interface
   // has its events bound and is ready for user interaction.
   window.performance.mark('navigationLoaded');
-  this.dispatchEvent('moz-chrome-dom-loaded');
   window.performance.mark('navigationInteractive');
-  this.dispatchEvent('moz-chrome-interactive');
 
   this.injectViews();
   this.booted = true;
@@ -252,12 +247,11 @@ App.prototype.onClick = function() {
 App.prototype.onCriticalPathDone = function() {
   if (this.criticalPathDone) { return; }
   debug('critical path done');
-  // PERFORMANCE EVENT (3): moz-app-visually-complete
+  // PERFORMANCE MARKER (3): visuallyLoaded
   // Designates that the app is visually loaded (e.g.: all of the
   // "above-the-fold" content exists in the DOM and is marked as
   // ready to be displayed).
   window.performance.mark('visuallyLoaded');
-  this.dispatchEvent('moz-app-visually-complete');
 
   // Load non-critical modules
   this.listenForStopRecordingEvent();
@@ -280,20 +274,18 @@ App.prototype.loadLazyModules = function() {
   done(function() {
     debug('app fully loaded');
 
-    // PERFORMANCE EVENT (4): moz-content-interactive
+    // PERFORMANCE MARKER (4): contentInteractive
     // Designates that the app has its events bound for the minimum
     // set of functionality to allow the user to interact with the
     // "above-the-fold" content.
     window.performance.mark('contentInteractive');
-    self.dispatchEvent('moz-content-interactive');
 
-    // PERFORMANCE EVENT (5): moz-app-loaded
+    // PERFORMANCE MARKER (5): fullyLoaded
     // Designates that the app is *completely* loaded and all relevant
     // "below-the-fold" content exists in the DOM, is marked visible,
     // has its events bound and is ready for user interaction. All
     // required startup background processing should be complete.
     window.performance.mark('fullyLoaded');
-    self.dispatchEvent('moz-app-loaded');
     self.perf.loaded = Date.now();
     self.loaded = true;
     self.emit('loaded');

apps/camera/js/config/require.js

@@ -8,7 +8,6 @@ requirejs.config({
     'l10n_date': '../shared/js/l10n_date',
     'asyncStorage': '../shared/js/async_storage',
     'getVideoRotation': '../shared/js/media/get_video_rotation',
-    'performance-testing-helper': '../shared/js/performance_testing_helper',
     'jpegMetaDataParser': '../shared/js/media/jpeg_metadata_parser',
     'downsample': '../shared/js/media/downsample',
     'getImageSize': '../shared/js/media/image_size',
@@ -70,9 +69,6 @@ requirejs.config({
     'asyncStorage': {
       exports: 'asyncStorage'
     },
-    'performance-testing-helper': {
-      exports: 'PerformanceTestingHelper'
-    },
     'jpegMetaDataParser': {
       deps: ['BlobView'],
       exports: 'parseJPEGMetadata'