Do not create unneeded Promise instances

ascarpello · Feb 18, 2016 · e75c9f2 · e75c9f2
1 parent e40a569
commit e75c9f2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/builtins/amp-ad.js b/builtins/amp-ad.js
@@ -282,7 +282,7 @@ export function installAd(win) {
       }
       return cidForOrNull(this.getWin()).then(cidService => {
         if (!cidService) {
-          return Promise.resolve();
+          return;
         }
         let consent = Promise.resolve();
         const consentId = this.element.getAttribute(

diff --git a/src/custom-element.js b/src/custom-element.js
@@ -740,7 +740,7 @@ export function createAmpElementProto(win, name, implementationClass) {
       }
     }, reason => {
       this.toggleLoading_(false, /* cleanup */ true);
-      return Promise.reject(reason);
+      throw reason;
     });
   };
 

diff --git a/src/service/resources-impl.js b/src/service/resources-impl.js
@@ -1781,17 +1781,13 @@ export class Resource {
       if (this.state_ == ResourceState_.LAYOUT_COMPLETE ||
               this.state_ == ResourceState_.LAYOUT_FAILED ||
               this.layoutCount_ > 0) {
-        return Promise.resolve();
+        return;
       }
       if (!this.isDisplayed()) {
-        return Promise.resolve();
+        return;
       }
       this.layoutCount_++;
-      try {
-        return this.element.layoutCallback();
-      } catch (e) {
-        return Promise.reject(e);
-      }
+      return this.element.layoutCallback();
     });
   }
 }

diff --git a/src/timer.js b/src/timer.js
@@ -119,7 +119,7 @@ export class Timer {
       if (timerKey != -1) {
         this.cancel(timerKey);
       }
-      return Promise.reject(error);
+      throw error;
     });
   }
 
@@ -148,7 +148,7 @@ export class Timer {
       if (timerKey != -1) {
         this.cancel(timerKey);
       }
-      return Promise.reject(error);
+      throw error;
     });
     if (!opt_racePromise) {
       return delayPromise;

diff --git a/src/url-replacements.js b/src/url-replacements.js
@@ -321,8 +321,8 @@ class UrlReplacements {
       return loadPromise(this.win_).then(() => {
         metric = timingInfo[endEvent] - timingInfo[startEvent];
         return (isNaN(metric) || metric == Infinity || metric < 0)
-            ? Promise.resolve()
-            : Promise.resolve(String(metric));
+            ? undefined
+            : String(metric);
       });
     } else {
       return Promise.resolve(String(metric));