API changes to image group

webshell/src/nsThrobber.cpp

@@ -31,6 +31,7 @@
 #include "nsWidgetsCID.h"
 #include "nsCRT.h"
 #include "prprf.h"
+#include "nsIDeviceContext.h"
 
 static NS_DEFINE_IID(kChildCID, NS_CHILD_CID);
 static NS_DEFINE_IID(kThrobberCID, NS_THROBBER_CID);
@@ -438,9 +439,9 @@ nsThrobber::LoadThrobberImages()
     return rv;
   }
 
-  nsIRenderingContext *drawCtx = mWidget->GetRenderingContext();
-  mImageGroup->Init(drawCtx);
-  NS_RELEASE(drawCtx);
+  nsIDeviceContext *deviceCtx = mWidget->GetDeviceContext();
+  mImageGroup->Init(deviceCtx);
+  NS_RELEASE(deviceCtx);
 
   rv = NS_NewTimer(&mTimer);
   if (NS_OK != rv) {

webshell/tests/imgtest/ImageTest.cpp

@@ -36,6 +36,7 @@
 #include "nsRect.h"
 #include "nsWidgetsCID.h"
 #include "nsGfxCIID.h"
+#include "nsIDeviceContext.h"
 
 static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID);
 static NS_DEFINE_IID(kIImageObserverIID, NS_IIMAGEREQUESTOBSERVER_IID);
@@ -196,15 +197,15 @@ MyLoadImage(char *aFileName)
     MyReleaseImages();
 
     if (gImageGroup == NULL) {
-        nsIRenderingContext *drawCtx = gWindow->GetRenderingContext();
+        nsIDeviceContext *deviceCtx = gWindow->GetDeviceContext();
         if (NS_NewImageGroup(&gImageGroup) != NS_OK ||
-            gImageGroup->Init(drawCtx) != NS_OK) {
+            gImageGroup->Init(deviceCtx) != NS_OK) {
                 ::MessageBox(NULL, "Couldn't create image group",
                              class1Name, MB_OK);
-                NS_RELEASE(drawCtx);
+                NS_RELEASE(deviceCtx);
                 return;
             }
-        NS_RELEASE(drawCtx);
+        NS_RELEASE(deviceCtx);
     }
 
     strcpy(fileURL, FILE_URL_PREFIX);