Bug 516195 - Port |Bug 435296 - imagelib should support decode-on-draw| to SeaMonkey; (Av1a) Support both m-1.9.2 and m-c (+ Create MOZILLA_1_9_2_BRANCH support)

r+a-seamonkey2.0=standard8

config/autoconf.mk.in

@@ -45,6 +45,7 @@ COMM_BUILD = @COMM_BUILD@
 MOZILLA_SRCDIR = $(topsrcdir)/mozilla
 MOZILLA_VERSION = @MOZILLA_VERSION@
 MOZILLA_1_9_1_BRANCH = @MOZILLA_1_9_1_BRANCH@
+MOZILLA_1_9_2_BRANCH = @MOZILLA_1_9_2_BRANCH@
 
 THUNDERBIRD_VERSION	= @THUNDERBIRD_VERSION@
 SUNBIRD_VERSION = @SUNBIRD_VERSION@

configure.in

@@ -243,16 +243,22 @@ changequote(,)
 MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
 changequote([,])
 
+dnl Set the Gecko 1.9.1 branch version.
 MOZILLA_1_9_1_BRANCH=
-
-dnl Set the Gecko 1.9.1 branch version
 if test "$MOZILLA_BRANCH_VERSION" = "1.9.1"; then
     MOZILLA_1_9_1_BRANCH=1
     AC_DEFINE(MOZILLA_1_9_1_BRANCH)
 fi
-
 AC_SUBST(MOZILLA_1_9_1_BRANCH)
 
+dnl Set the Gecko 1.9.2 branch version.
+MOZILLA_1_9_2_BRANCH=
+if test "$MOZILLA_BRANCH_VERSION" = "1.9.2"; then
+    MOZILLA_1_9_2_BRANCH=1
+    AC_DEFINE(MOZILLA_1_9_2_BRANCH)
+fi
+AC_SUBST(MOZILLA_1_9_2_BRANCH)
+
 
 dnl ========================================================
 dnl Checks for compilers.

suite/shell/src/nsWindowsShellService.cpp

@@ -604,7 +604,13 @@ WriteBitmap(nsIFile* aFile, imgIContainer* aImage)
   image->GetImageBytesPerRow(&bpr);
 #else
   nsRefPtr<gfxImageSurface> image;
+#ifdef MOZILLA_1_9_2_BRANCH
   nsresult rv = aImage->CopyCurrentFrame(getter_AddRefs(image));
+#else
+  nsresult rv = aImage->CopyFrame(imgIContainer::FRAME_CURRENT,
+                                  imgIContainer::FLAG_SYNC_DECODE,
+                                  getter_AddRefs(image));
+#endif
   NS_ENSURE_SUCCESS(rv, rv);
 
   PRInt32 width = image->Width();
@@ -613,7 +619,7 @@ WriteBitmap(nsIFile* aFile, imgIContainer* aImage)
   PRUint8* bits = image->Data();
   PRUint32 length = image->GetDataSize();
   PRUint32 bpr = PRUint32(image->Stride());
-#endif
+#endif // else MOZILLA_1_9_1_BRANCH
 
   PRInt32 bitCount = bpr/width;