Bug 989984 - getShortcutOrURIAndPostData should have a synchronous callback behavior

Issue #112

application/palemoon/base/content/browser.js

@@ -1898,8 +1898,7 @@ function loadURI(uri, referrer, postData, allowThirdPartyFixup) {
   } catch (e) {}
 }
 
-function getShortcutOrURIAndPostData(aURL) {
+function getShortcutOrURIAndPostData(aURL, aCallback) {
-  return Task.spawn(function() {
   let mayInheritPrincipal = false;
   let postData = null;
   let shortcutURL = null;
@@ -1916,17 +1915,19 @@ function getShortcutOrURIAndPostData(aURL) {
   if (engine) {
     let submission = engine.getSubmission(param);
     postData = submission.postData;
-      throw new Task.Result({ postData: submission.postData,
+    aCallback({ postData: submission.postData, url: submission.uri.spec,
-                              url: submission.uri.spec,
                 mayInheritPrincipal: mayInheritPrincipal });
+    return;
   }
 
   [shortcutURL, postData] =
     PlacesUtils.getURLAndPostDataForKeyword(keyword);
 
-    if (!shortcutURL)
+  if (!shortcutURL) {
-      throw new Task.Result({ postData: postData, url: aURL,
+    aCallback({ postData: postData, url: aURL,
                 mayInheritPrincipal: mayInheritPrincipal });
+    return;
+  }
 
   let escapedPostData = "";
   if (postData)
@@ -1936,17 +1937,8 @@ function getShortcutOrURIAndPostData(aURL) {
     let charset = "";
     const re = /^(.*)\&mozcharset=([a-zA-Z][_\-a-zA-Z0-9]+)\s*$/;
     let matches = shortcutURL.match(re);
-      if (matches)
-        [, shortcutURL, charset] = matches;
-      else {
-        // Try to get the saved character-set.
-        try {
-          // makeURI throws if URI is invalid.
-          // Will return an empty string if character-set is not found.
-          charset = yield PlacesUtils.getCharsetForURI(makeURI(shortcutURL));
-        } catch (e) {}
-      }
 
+    let continueOperation = function () {
       // encodeURIComponent produces UTF-8, and cannot be used for other charsets.
       // escape() works in those cases, but it doesn't uri-encode +, @, and /.
       // Therefore we need to manually replace these ASCII characters by their
@@ -1964,23 +1956,45 @@ function getShortcutOrURIAndPostData(aURL) {
       if (/%s/i.test(escapedPostData)) // POST keyword
         postData = getPostDataStream(escapedPostData, param, encodedParam,
                                                "application/x-www-form-urlencoded");
+
+      // This URL came from a bookmark, so it's safe to let it inherit the current
+      // document's principal.
+      mayInheritPrincipal = true;
+
+      aCallback({ postData: postData, url: shortcutURL,
+                  mayInheritPrincipal: mayInheritPrincipal });
+    }
+
+    if (matches) {
+      [, shortcutURL, charset] = matches;
+      continueOperation();
+    } else {
+      // Try to get the saved character-set.
+      // makeURI throws if URI is invalid.
+      // Will return an empty string if character-set is not found.
+      try {
+        PlacesUtils.getCharsetForURI(makeURI(shortcutURL))
+                   .then(c => { charset = c; continueOperation(); });
+      } catch (ex) {
+        continueOperation();
+      }
+    }
   }
   else if (param) {
     // This keyword doesn't take a parameter, but one was provided. Just return
     // the original URL.
     postData = null;
 
-      throw new Task.Result({ postData: postData, url: aURL,
+    aCallback({ postData: postData, url: aURL,
                 mayInheritPrincipal: mayInheritPrincipal });
-    }
+  } else {
-
     // This URL came from a bookmark, so it's safe to let it inherit the current
     // document's principal.
     mayInheritPrincipal = true;
 
-    throw new Task.Result({ postData: postData, url: shortcutURL,
+    aCallback({ postData: postData, url: shortcutURL,
                 mayInheritPrincipal: mayInheritPrincipal });
-  });
+  }
 }
 
 function getPostDataStream(aStringData, aKeyword, aEncKeyword, aType) {
@@ -2725,8 +2739,7 @@ var newTabButtonObserver = {
   onDrop: function (aEvent)
   {
     let url = browserDragAndDrop.drop(aEvent, { });
-    Task.spawn(function() {
+    getShortcutOrURIAndPostData(url, data => {
-      let data = yield getShortcutOrURIAndPostData(url);
       if (data.url) {
         // allow third-party services to fixup this URL
         openNewTabWith(data.url, null, data.postData, aEvent, true);
@@ -2746,8 +2759,7 @@ var newWindowButtonObserver = {
   onDrop: function (aEvent)
   {
     let url = browserDragAndDrop.drop(aEvent, { });
-    Task.spawn(function() {
+    getShortcutOrURIAndPostData(url, data => {
-      let data = yield getShortcutOrURIAndPostData(url);
       if (data.url) {
         // allow third-party services to fixup this URL
         openNewWindowWith(data.url, null, data.postData, true);
@@ -5048,8 +5060,7 @@ function middleMousePaste(event) {
     lastLocationChange = gBrowser.selectedBrowser.lastLocationChange;
   }
 
-  Task.spawn(function() {
+  getShortcutOrURIAndPostData(clipboard, data => {
-    let data = yield getShortcutOrURIAndPostData(clipboard);
     try {
       makeURI(data.url);
     } catch (ex) {
@@ -5080,8 +5091,7 @@ function handleDroppedLink(event, url, name)
 {
   let lastLocationChange = gBrowser.selectedBrowser.lastLocationChange;
 
-  Task.spawn(function() {
+  getShortcutOrURIAndPostData(url, data => {
-    let data = yield getShortcutOrURIAndPostData(url);
     if (data.url &&
         lastLocationChange == gBrowser.selectedBrowser.lastLocationChange)
       loadURI(data.url, null, data.postData, false);

application/palemoon/base/content/urlbarBindings.xml

@@ -264,7 +264,7 @@
 
           var action = this._parseActionUrl(url);
           let lastLocationChange = gBrowser.selectedBrowser.lastLocationChange;
-          Task.spawn(function() {
+
           let matchLastLocationChange = true;
           if (action) {
             url = action.param;
@@ -278,15 +278,21 @@
               }
               return;
             }
+            continueOperation.call(this);
           }
           else {
-              [url, postData, mayInheritPrincipal] = yield this._canonizeURL(aTriggeringEvent);
+            this._canonizeURL(aTriggeringEvent, response => {
+              [url, postData, mayInheritPrincipal] = response;
+              if (url) {
                 matchLastLocationChange = (lastLocationChange ==
                                            gBrowser.selectedBrowser.lastLocationChange);
-              if (!url)
+                continueOperation.call(this);
-                return;
+              }
+            });
           }
 
+          function continueOperation()
+          {
             this.value = url;
             gBrowser.userTypedValue = url;
             try {
@@ -355,17 +361,19 @@
                 loadCurrent();
               }
             }
-          }.bind(this));
+          }
         ]]></body>
       </method>
 
       <method name="_canonizeURL">
         <parameter name="aTriggeringEvent"/>
+        <parameter name="aCallback"/>
         <body><![CDATA[
-          return Task.spawn(function() {
           var url = this.value;
-            if (!url)
+          if (!url) {
-              throw new Task.Result(["", null, false]);
+            aCallback(["", null, false]);
+            return;
+          }
 
           // Only add the suffix when the URL bar value isn't already "URL-like",
           // and only if we get a keyboard event, to match user expectations.
@@ -418,10 +426,9 @@
             }
           }
 
-            let data = yield getShortcutOrURIAndPostData(url);
+          getShortcutOrURIAndPostData(url, data => {
-
+            aCallback([data.url, data.postData, data.mayInheritPrincipal]);
-            throw new Task.Result([data.url, data.postData, data.mayInheritPrincipal]);
+          });
-          }.bind(this));
         ]]></body>
       </method>