Web Inspector: SourceCode.requestContent should return a promise

[WebKit-https.git] / Source / WebInspectorUI / UserInterface / Models / Script.js

diff --git a/Source/WebInspectorUI/UserInterface/Models/Script.js b/Source/WebInspectorUI/UserInterface/Models/Script.js
index b4c9e29fece029da99699006ff827c04882ed0de..8340c35cae6a45aab06f28efdbc7ea21738beccc 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/Models/Script.js
+++ b/Source/WebInspectorUI/UserInterface/Models/Script.js
@@ -110,22 +110,15 @@ WebInspector.Script.prototype = {
         return this._scriptSyntaxTree;
     },
 
-    canRequestContentFromBackend: function()
-    {
-        // We can request content if we have an id.
-        return !!this._id;
-    },
-
     requestContentFromBackend: function(callback)
     {
         if (!this._id) {
             // There is no identifier to request content with. Return false to cause the
             // pending callbacks to get null content.
-            return false;
+            return Promise.reject({ message: "There is no identifier to request content with." });
         }
 
-        DebuggerAgent.getScriptSource(this._id, callback);
-        return true;
+        return DebuggerAgent.getScriptSource.promise(this._id);
     },
 
     saveIdentityToCookie: function(cookie)
@@ -155,8 +148,10 @@ WebInspector.Script.prototype = {
             return;
         }
 
-        this.requestContent(function(error, sourceText) {
-            makeSyntaxTreeAndCallCallback(error ? null : sourceText);
+        this.requestContent().then(function(parameters) {
+            makeSyntaxTreeAndCallCallback(parameters.content);
+        }).catch(function(error) {
+            makeSyntaxTreeAndCallCallback(null);
         });
     },