Commit 5935d90c authored by Tetsuharu OHZEKI's avatar Tetsuharu OHZEKI
Browse files

Backed out changeset 9ed8b82d0548 for incorrect commit message.

parent 82c06dbe

toolkit/components/places/PlacesUtils.jsm

+7 −7
Original line number Original line Diff line number Diff line
@@ -1698,12 +1698,12 @@ let GUIDHelper = { 
        if (row)

        if (row)

          itemId = row.getResultByIndex(0);

          itemId = row.getResultByIndex(0);

      },

      },

      handleCompletion: aReason => {

      handleCompletion: function (aReason) {

        if (aReason == REASON_FINISHED && itemId != -1) {

        if (aReason == REASON_FINISHED && itemId != -1) {

          deferred.resolve(itemId);



          this.ensureObservingRemovedItems();

          this.ensureObservingRemovedItems();

          this.idsForGUIDs.set(aGUID, itemId);

          this.idsForGUIDs.set(aGUID, itemId);



          deferred.resolve(itemId);

        }

        }

        else if (itemId != -1) {

        else if (itemId != -1) {

          deferred.reject("no item found for the given guid");

          deferred.reject("no item found for the given guid");
@@ -1719,7 +1719,7 @@ let GUIDHelper = { 




  getItemGUID: function (aItemId) {

  getItemGUID: function (aItemId) {

    if (this.GUIDsForIds.has(aItemId))

    if (this.GUIDsForIds.has(aItemId))

      return Promise.resolve(this.GUIDsForIds.get(aItemId));

      return Promise.resolve(this.GUIDsForIds.has(aItemId));





    let deferred = Promise.defer();

    let deferred = Promise.defer();

    let guid = "";

    let guid = "";
@@ -1732,12 +1732,12 @@ let GUIDHelper = { 
          guid = row.getResultByIndex(1);

          guid = row.getResultByIndex(1);

        }

        }

      },

      },

      handleCompletion: aReason => {

      handleCompletion: function (aReason) {

        if (aReason == REASON_FINISHED && guid) {

        if (aReason == REASON_FINISHED && guid) {

          deferred.resolve(guid);



          this.ensureObservingRemovedItems();

          this.ensureObservingRemovedItems();

          this.GUIDsForIds.set(aItemId, guid);

          this.GUIDsForIds.set(aItemId, guid);



          deferred.resolve(guid);

        }

        }

        else if (!guid) {

        else if (!guid) {

          deferred.reject("no item found for the given itemId");

          deferred.reject("no item found for the given itemId");