185517 qt mozilla doesn't display images

QT ONLY - r=timeless rs=bz

gfx/src/qt/Makefile.in

@@ -106,5 +106,6 @@ endif
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/. \
 		-I$(srcdir)/.. \
+		-I$(srcdir)/../shared \
 		$(NULL)
 

gfx/src/qt/nsGfxFactoryQT.cpp

@@ -53,6 +53,7 @@
 #include "nsImageQT.h"
 #include "nsFontList.h"
 #include "nsPrintSession.h"
+#include "gfxImageFrame.h"
 
 #include "qtlog.h"
 
@@ -73,6 +74,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorQT)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerQT)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrame)
 
 // our custom constructors
 static nsresult nsScriptableRegionConstructor(nsISupports *aOuter,REFNSIID aIID,void **aResult)
@@ -159,6 +161,10 @@ static const nsModuleComponentInfo components[] =
     NS_SCREENMANAGER_CID,
     "@mozilla.org/gfx/screenmanager;1",
     nsScreenManagerQTConstructor },
+  { "shared image frame",
+    GFX_IMAGEFRAME_CID,
+    "@mozilla.org/gfx/image/frame;2",
+    gfxImageFrameConstructor, },
   { "Print Session",
     NS_PRINTSESSION_CID,
     "@mozilla.org/gfx/printsession;1",

gfx/src/qt/nsImageQT.cpp

@@ -152,7 +152,7 @@ nsresult nsImageQT::Init(PRInt32 aWidth,PRInt32 aHeight,
         mRequestDepth = aDepth;
     }
     else {
-        NS_ASSERTION(PR_FALSE, "unexpected image depth");
+        NS_NOTREACHED("unexpected image depth");
         return NS_ERROR_UNEXPECTED;
     }
     mWidth = aWidth;
@@ -194,6 +194,7 @@ nsresult nsImageQT::Init(PRInt32 aWidth,PRInt32 aHeight,
         mAlphaHeight = aHeight;
         break;
     }
+    PR_LOG(gQTLogModule, QT_BASIC, ("nsImageQT::Init succeeded"));
     return NS_OK;
 }