diff --git a/mozilla/gfx/src/shared/gfxImageFrame.cpp b/mozilla/gfx/src/shared/gfxImageFrame.cpp
index 53d72d1fbd4..6194105fef3 100644
--- a/mozilla/gfx/src/shared/gfxImageFrame.cpp
+++ b/mozilla/gfx/src/shared/gfxImageFrame.cpp
@@ -270,8 +270,6 @@ NS_IMETHODIMP gfxImageFrame::GetImageData(PRUint8 **aData, PRUint32 *length)
   if (!mInitialized)
     return NS_ERROR_NOT_INITIALIZED;
 
-  NS_ASSERTION(mMutable, "trying to get data on an immutable frame");
-
   *aData = mImage->GetBits();
   *length = mImage->GetLineStride() * mSize.height;
 
diff --git a/mozilla/gfx/src/thebes/nsThebesImage.cpp b/mozilla/gfx/src/thebes/nsThebesImage.cpp
index 164ff80ddf6..8b968fbb335 100644
--- a/mozilla/gfx/src/thebes/nsThebesImage.cpp
+++ b/mozilla/gfx/src/thebes/nsThebesImage.cpp
@@ -319,6 +319,10 @@ nsThebesImage::UnlockImagePixels(PRBool aMaskPixels)
     if (aMaskPixels)
         return NS_ERROR_NOT_IMPLEMENTED;
     if (mImageSurface && mOptSurface) {
+        nsRefPtr<gfxContext> context = new gfxContext(mOptSurface);
+        context->SetOperator(gfxContext::OPERATOR_SOURCE);
+        context->SetSource(mImageSurface);
+        context->Paint();
         // Don't need the pixel data anymore
         mImageSurface = nsnull;
     }
diff --git a/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp b/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
index 0a16c4b008b..e6c39f34079 100644
--- a/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
+++ b/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
@@ -555,6 +555,8 @@ nsJPEGDecoder::OutputScanlines()
   const PRUint32 top = mInfo.output_scanline;
   PRBool rv = PR_TRUE;
 
+  mFrame->LockImageData();
+  
   // we're thebes. we can write stuff directly to the data
   PRUint8 *imageData;
   PRUint32 imageDataLength;
@@ -605,7 +607,9 @@ nsJPEGDecoder::OutputScanlines()
       img->ImageUpdated(nsnull, nsImageUpdateFlags_kBitsChanged, &r);
       mObserver->OnDataAvailable(nsnull, mFrame, &r);
   }
-
+  
+  mFrame->UnlockImageData();
+  
   return rv;
 }