merge

image/src/RasterImage.cpp

@@ -234,8 +234,8 @@ RasterImage::RasterImage(imgStatusTracker* aStatusTracker) :
   mInDecoder(false),
   mAnimationFinished(false),
   mFinishing(false),
-  mInUpdateImageContainer(false),
-  mScaleRequest(this)
+  mScaleRequest(this),
+  mInUpdateImageContainer(false)
 {
   // Set up the discard tracker node.
   mDiscardTrackerNode.img = this;
@@ -2714,10 +2714,6 @@ RasterImage::ScaleWorker::RequestScale(RasterImage* aImg)
   if (request->isInList())
     return;
 
-  // While the request is outstanding, we hold a reference to it so it won't be
-  // deleted from under us (and, since it owns us, so we won't be deleted).
-  request->kungFuDeathGrip = request->image;
-
   mScaleRequests.insertBack(request);
 
   if (!sScaleWorkerThread) {
@@ -2762,11 +2758,6 @@ RasterImage::DrawWorker::Run()
       nsIntRect frameRect = request->srcFrame->GetRect();
       observer->FrameChanged(nullptr, request->image, &frameRect);
     }
-    if (request->done) {
-      // We are now done with this image, so we can release our reference.
-      // THIS CAN DELETE THE REQUEST!
-      request->kungFuDeathGrip = nullptr;
-    }
   }
 
   return NS_OK;

image/src/RasterImage.h

@@ -511,7 +511,6 @@ private:
     static void Stop(RasterImage* aImg);
 
     RasterImage* const image;
-    nsRefPtr<RasterImage> kungFuDeathGrip;
     imgFrame *srcFrame;
     nsAutoPtr<imgFrame> dstFrame;
     gfxSize scale;

toolkit/components/downloads/nsDownloadManager.h

@@ -382,7 +382,6 @@ private:
   nsCOMPtr<nsIMIMEInfo> mMIMEInfo;
 
   DownloadState mDownloadState;
-  DownloadType mDownloadType;
 
   uint32_t mID;
   int32_t mPercentComplete;

toolkit/components/places/Database.cpp

@@ -340,7 +340,6 @@ Database::Database()
   , mMainThreadAsyncStatements(mMainConn)
   , mAsyncThreadStatements(mMainConn)
   , mDBPageSize(0)
-  , mCurrentJournalMode(JOURNAL_DELETE)
   , mDatabaseStatus(nsINavHistoryService::DATABASE_STATUS_OK)
   , mShuttingDown(false)
 {

toolkit/components/places/Database.h

@@ -295,7 +295,6 @@ private:
   mutable StatementCache mAsyncThreadStatements;
 
   int32_t mDBPageSize;
-  enum JournalMode mCurrentJournalMode;
   uint16_t mDatabaseStatus;
   bool mShuttingDown;
 };