Refactor methods in viewer into performance-impl (ampproject#6252)

Lith · Dec 22, 2016 · 8534f8a · 8534f8a
1 parent 860a080
commit 8534f8a
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 107 deletions.
diff --git a/build-system/tasks/presubmit-checks.js b/build-system/tasks/presubmit-checks.js
@@ -257,11 +257,19 @@ var forbiddenTerms = {
     whitelist: [
       'src/service/viewer-impl.js',
       'src/service/storage-impl.js',
+      'src/service/performance-impl.js',
       'examples/viewer-integr-messaging.js',
       'extensions/amp-access/0.1/login-dialog.js',
       'extensions/amp-access/0.1/signin.js',
     ],
   },
+  'sendMessageCancelUnsent': {
+    message: 'Usages must be reviewed.',
+    whitelist: [
+      'src/service/viewer-impl.js',
+      'src/service/performance-impl.js',
+    ],
+  },
   // Privacy sensitive
   'cidFor': {
     message: requiresReviewPrivacy,

diff --git a/src/service/performance-impl.js b/src/service/performance-impl.js
@@ -221,7 +221,8 @@ export class Performance {
    * @private
    */
   setFlushParams_(params) {
-    this.viewer_.setFlushParams(params);
+    this.viewer_.sendMessageCancelUnsent('setFlushParams', params,
+        /* awaitResponse */false);
   }
 
   /**
@@ -239,11 +240,11 @@ export class Performance {
     opt_value = opt_value == undefined ? Date.now() : opt_value;
 
     if (this.isMessagingReady_ && this.isPerformanceTrackingOn_) {
-      this.viewer_.tick({
+      this.viewer_.sendMessage('tick', {
         label,
         from: opt_from,
         value: opt_value,
-      });
+      }, /* awaitResponse */false);
     } else {
       this.queueTick_(label, opt_from, opt_value);
     }
@@ -282,11 +283,12 @@ export class Performance {
 
 
   /**
-   * Calls the "flushTicks" function on the viewer.
+   * Ask the viewer to flush the ticks
    */
   flush() {
     if (this.isMessagingReady_ && this.isPerformanceTrackingOn_) {
-      this.viewer_.flushTicks();
+      this.viewer_.sendMessageCancelUnsent('sendCsi', undefined,
+          /* awaitResponse */false);
     }
   }
 
@@ -332,7 +334,7 @@ export class Performance {
     }
 
     this.events_.forEach(tickEvent => {
-      this.viewer_.tick(tickEvent);
+      this.viewer_.sendMessage('tick', tickEvent, /* awaitResponse */false);
     });
     this.events_.length = 0;
   }
@@ -370,9 +372,8 @@ export class Performance {
    */
   prerenderComplete_(value) {
     if (this.viewer_) {
-      this.viewer_.prerenderComplete({
-        value,
-      });
+      this.viewer_.sendMessageCancelUnsent('prerenderComplete', {value},
+          /* awaitResponse */false);
     }
   }
 

diff --git a/src/service/viewer-impl.js b/src/service/viewer-impl.js
@@ -881,41 +881,6 @@ export class Viewer {
         'fragment', {fragment}, true));
   }
 
-  /**
-   * Triggers "tick" event for the viewer.
-   * @param {!Object} message
-   * TODO: move this to performance-impl, and use sendMessage()
-   */
-  tick(message) {
-    this.sendMessageCancelUnsent('tick', message, false);
-  }
-
-  /**
-   * Triggers "sendCsi" event for the viewer.
-   * TODO: move this to performance-impl
-   */
-  flushTicks() {
-    this.sendMessageCancelUnsent('sendCsi', undefined, false);
-  }
-
-  /**
-   * Triggers "setFlushParams" event for the viewer.
-   * @param {!Object} message
-   * TODO: move this to performance-impl
-   */
-  setFlushParams(message) {
-    this.sendMessageCancelUnsent('setFlushParams', message, false);
-  }
-
-  /**
-   * Triggers "prerenderComplete" event for the viewer.
-   * @param {!Object} message
-   * TODO: move this to performance-impl
-   */
-  prerenderComplete(message) {
-    this.sendMessageCancelUnsent('prerenderComplete', message, false);
-  }
-
   /**
    * Requests AMP document to receive a message from Viewer.
    * @param {string} eventType