DevTools: promisify ContentProvider.requestContent and all its clients.

third_party/WebKit/Source/devtools/front_end/sdk/Resource.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 76 matching lines @@
      * @param {?string} content
      */
     function onResourceContent(content)
     {
         var imageSrc = WebInspector.Resource.contentAsDataURL(content, mimeType, true);
         if (imageSrc === null)
             imageSrc = url;
         image.src = imageSrc;
     }
 
-    contentProvider.requestContent(onResourceContent);
+    contentProvider.requestContent().then(onResourceContent);
 }
 
 WebInspector.Resource.prototype = {
     /**
      * @return {?WebInspector.NetworkRequest}
      */
     get request()
     {
         return this._request;
     },
@@ skipping 96 matching lines @@
      */
     contentType: function()
     {
         if (this.resourceType() === WebInspector.resourceTypes.Document && this.mimeType.indexOf("javascript") !== -1)
             return WebInspector.resourceTypes.Script;
         return this.resourceType();
     },
 
     /**
      * @override
-     * @param {function(?string)} callback
+     * @return {!Promise<?string>}
      */
-    requestContent: function(callback)
+    requestContent: function()
     {
-        if (typeof this._content !== "undefined") {
-            callback(this._content);
-            return;
-        }
+        if (typeof this._content !== "undefined")
+            return Promise.resolve(this._content);
 
+        var callback;
+        var promise = new Promise(fulfill => callback = fulfill);

[pfeldman, 2016/01/20 19:23:51]

cache promise

         this._pendingContentCallbacks.push(callback);
         if (!this._request || this._request.finished)
             this._innerRequestContent();
+        return promise;
     },
 
     /**
      * @return {string}
      */
     canonicalMimeType: function()
     {
         return this.contentType().canonicalMimeType() || this.mimeType;
     },
 
@@ skipping 79 matching lines @@
          * @param {string} content
          * @param {boolean} contentEncoded
          * @this {WebInspector.Resource}
          */
         function resourceContentLoaded(error, content, contentEncoded)
         {
             contentLoaded.call(this, error, content, contentEncoded);
         }
 
         if (this.request) {
-            this.request.requestContent(requestContentLoaded.bind(this));
+            this.request.requestContent().then(requestContentLoaded.bind(this));
             return;
         }
 
         /**
          * @param {?string} content
          * @this {WebInspector.Resource}
          */
         function requestContentLoaded(content)
         {
             contentLoaded.call(this, null, content, this.request.contentEncoded);
@@ skipping 19 matching lines @@
         if (this._type.isTextType())
             return true;
         if (this._type === WebInspector.resourceTypes.Other)
             return !!this._content && !this._contentEncoded;
         return false;
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }