Commit 5e5d254f authored by Dietrich Ayala's avatar Dietrich Ayala
Browse files

[mq]: backout-bug-463471

parent 56517d34

toolkit/components/places/public/nsPIPlacesDatabase.idl

+1 −7
Original line number Diff line number Diff line
@@ -46,17 +46,11 @@ interface mozIStorageConnection; 
 * database.  If outside consumers wish to use this, they should only read from

 * the database so they do not break any internal invariants.

 */

[scriptable, uuid(8e6d4f8a-4b8e-4026-9fca-517c4494ddb7)]

[scriptable, uuid(daa7d3ba-8e24-4228-93b5-2c188bad7d36)]

interface nsPIPlacesDatabase : nsISupports

{

  /**

   * The database connection used by Places.

   */

  readonly attribute mozIStorageConnection DBConnection;



  /**

   * Finalizes all Places internal statements, allowing to safely close the

   * database connection.

   */

  void finalizeInternalStatements();

};

toolkit/components/places/src/nsAnnotationService.cpp

+0 −19
Original line number Diff line number Diff line
@@ -2007,22 +2007,3 @@ nsAnnotationService::CallSetForItemObservers(PRInt64 aItemId, const nsACString& 
  for (PRInt32 i = 0; i < mObservers.Count(); i ++)

    mObservers[i]->OnItemAnnotationSet(aItemId, aName);

}
 


void

nsAnnotationService::FinalizeStatements() {

    mDBSetAnnotation = nsnull;

    mDBSetItemAnnotation = nsnull;

    mDBGetAnnotation = nsnull;

    mDBGetItemAnnotation = nsnull;

    mDBGetAnnotationNames = nsnull;

    mDBGetItemAnnotationNames = nsnull;

    mDBGetAnnotationFromURI = nsnull;

    mDBGetAnnotationFromItemId = nsnull;

    mDBGetAnnotationNameID = nsnull;

    mDBAddAnnotationName = nsnull;

    mDBAddAnnotation = nsnull;

    mDBAddItemAnnotation = nsnull;

    mDBRemoveAnnotation = nsnull;

    mDBRemoveItemAnnotation = nsnull;

    mDBGetItemsWithAnnotation = nsnull;

}

toolkit/components/places/src/nsAnnotationService.h

+0 −5
Original line number Diff line number Diff line
@@ -78,11 +78,6 @@ public: 
    return gAnnotationService;

  }



  /**

   * Finalize all internal statements.

   */

  void FinalizeStatements();



  NS_DECL_ISUPPORTS

  NS_DECL_NSIANNOTATIONSERVICE

toolkit/components/places/src/nsFaviconService.cpp

+0 −9
Original line number Diff line number Diff line
@@ -1011,15 +1011,6 @@ nsFaviconService::OptimizeFaviconImage(const PRUint8* aData, PRUint32 aDataLen, 
  return NS_OK;

}



void

nsFaviconService::FinalizeStatements() {

  mDBGetURL = nsnull;

  mDBGetData = nsnull;

  mDBGetIconInfo = nsnull;

  mDBInsertIcon = nsnull;

  mDBUpdateIcon = nsnull;

  mDBSetPageFavicon = nsnull;

}



NS_IMPL_ISUPPORTS4(FaviconLoadListener,

                   nsIRequestObserver,

toolkit/components/places/src/nsFaviconService.h

+1 −6
Original line number Diff line number Diff line
@@ -90,15 +90,10 @@ public: 
  static nsresult OptimizeFaviconImage(const PRUint8* aData, PRUint32 aDataLen,

                                       const nsACString& aMimeType,

                                       nsACString& aNewData, nsACString& aNewMimeType);



  /**

   * Finalize all internal statements.

   */

  void FinalizeStatements();



  NS_DECL_ISUPPORTS

  NS_DECL_NSIFAVICONSERVICE





private:

  ~nsFaviconService();