Fix the 'bustage' of browser_parsable_script.js coming from bug 1067954 by whitelisting controller.js. It broke due to bug 1015578 (see mak's comment 2 there). CLOSED TREE
authorAsaf Romano <mano@mozilla.com>
Fri, 19 Sep 2014 18:23:20 +0300
changeset 206244 014f231ac17308d76631dbc5d59882070549e60e
parent 206243 6c2940e4d2834ef25572649998c0232b204761b7
child 206245 a084c4cfd8a1ce35927526d38985ef805427c144
child 206251 4b348553c600121d923c7c1496c72853daf41be0
push id27517
push userryanvm@gmail.com
push dateFri, 19 Sep 2014 18:13:39 +0000
treeherdermozilla-central@a084c4cfd8a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1067954, 1015578
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fix the 'bustage' of browser_parsable_script.js coming from bug 1067954 by whitelisting controller.js. It broke due to bug 1015578 (see mak's comment 2 there). CLOSED TREE
browser/base/content/test/general/browser_parsable_script.js
browser/components/places/content/controller.js
--- a/browser/base/content/test/general/browser_parsable_script.js
+++ b/browser/base/content/test/general/browser_parsable_script.js
@@ -2,16 +2,17 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /* This list allows pre-existing or 'unfixable' JS issues to remain, while we
  * detect newly occurring issues in shipping JS. It is a list of regexes
  * matching files which have errors:
  */
 const kWhitelist = new Set([
   /defaults\/profile\/prefs.js$/,
+  /browser\/content\/browser\/places\/controller.js$/,
 ]);
 
 
 let moduleLocation = gTestPath.replace(/\/[^\/]*$/i, "/parsingTestHelpers.jsm");
 let {generateURIsFromDirTree} = Cu.import(moduleLocation, {});
 let {Reflect} = Cu.import("resource://gre/modules/reflect.jsm", {});
 
 /**
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -1244,18 +1244,17 @@ PlacesController.prototype = {
       if (!didSuppressNotifications)
         result.suppressNotifications = false;
     }
   },
 
   /**
    * Paste Bookmarks and Folders from the clipboard
    */
-  paste: Task.async(function *() {
-
+  paste: Task.async(function* () {
     // No reason to proceed if there isn't a valid insertion point.
     let ip = this._view.insertionPoint;
     if (!ip)
       throw Cr.NS_ERROR_NOT_AVAILABLE;
 
     let action = this.clipboardAction;
 
     let xferable = Cc["@mozilla.org/widget/transferable;1"].
@@ -1286,17 +1285,17 @@ PlacesController.prototype = {
     if (PlacesUIUtils.useAsyncTransactions) {
       if (ip.isTag) {
         let uris = [for (item of items) if ("uri" in item)
                     NetUtil.newURI(item.uri)];
         yield PlacesTransactions.transact(
           PlacesTransactions.Tag({ uris: uris, tag: ip.tagName }));
       }
       else {
-        yield PlacesTransactions.transact(function *() {
+        yield PlacesTransactions.transact(function* () {
           let insertionIndex = ip.index;
           let parent = yield ip.promiseGuid();
 
           for (let item of items) {
             let doCopy = action == "copy";
 
             // If this is not a copy, check for safety that we can move the
             // source, otherwise report an error and fallback to a copy.