mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-26 04:09:50 +00:00
185517 qt mozilla doesn't display images
QT ONLY - r=timeless rs=bz
This commit is contained in:
parent
3e9a5f3d4c
commit
91a22d4fd5
@ -106,5 +106,6 @@ endif
|
|||||||
LOCAL_INCLUDES = \
|
LOCAL_INCLUDES = \
|
||||||
-I$(srcdir)/. \
|
-I$(srcdir)/. \
|
||||||
-I$(srcdir)/.. \
|
-I$(srcdir)/.. \
|
||||||
|
-I$(srcdir)/../shared \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
@ -53,6 +53,7 @@
|
|||||||
#include "nsImageQT.h"
|
#include "nsImageQT.h"
|
||||||
#include "nsFontList.h"
|
#include "nsFontList.h"
|
||||||
#include "nsPrintSession.h"
|
#include "nsPrintSession.h"
|
||||||
|
#include "gfxImageFrame.h"
|
||||||
|
|
||||||
#include "qtlog.h"
|
#include "qtlog.h"
|
||||||
|
|
||||||
@ -73,6 +74,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorQT)
|
|||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList);
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList);
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerQT)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerQT)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
|
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
|
||||||
|
NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrame)
|
||||||
|
|
||||||
// our custom constructors
|
// our custom constructors
|
||||||
static nsresult nsScriptableRegionConstructor(nsISupports *aOuter,REFNSIID aIID,void **aResult)
|
static nsresult nsScriptableRegionConstructor(nsISupports *aOuter,REFNSIID aIID,void **aResult)
|
||||||
@ -159,6 +161,10 @@ static const nsModuleComponentInfo components[] =
|
|||||||
NS_SCREENMANAGER_CID,
|
NS_SCREENMANAGER_CID,
|
||||||
"@mozilla.org/gfx/screenmanager;1",
|
"@mozilla.org/gfx/screenmanager;1",
|
||||||
nsScreenManagerQTConstructor },
|
nsScreenManagerQTConstructor },
|
||||||
|
{ "shared image frame",
|
||||||
|
GFX_IMAGEFRAME_CID,
|
||||||
|
"@mozilla.org/gfx/image/frame;2",
|
||||||
|
gfxImageFrameConstructor, },
|
||||||
{ "Print Session",
|
{ "Print Session",
|
||||||
NS_PRINTSESSION_CID,
|
NS_PRINTSESSION_CID,
|
||||||
"@mozilla.org/gfx/printsession;1",
|
"@mozilla.org/gfx/printsession;1",
|
||||||
|
@ -152,7 +152,7 @@ nsresult nsImageQT::Init(PRInt32 aWidth,PRInt32 aHeight,
|
|||||||
mRequestDepth = aDepth;
|
mRequestDepth = aDepth;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
NS_ASSERTION(PR_FALSE, "unexpected image depth");
|
NS_NOTREACHED("unexpected image depth");
|
||||||
return NS_ERROR_UNEXPECTED;
|
return NS_ERROR_UNEXPECTED;
|
||||||
}
|
}
|
||||||
mWidth = aWidth;
|
mWidth = aWidth;
|
||||||
@ -194,6 +194,7 @@ nsresult nsImageQT::Init(PRInt32 aWidth,PRInt32 aHeight,
|
|||||||
mAlphaHeight = aHeight;
|
mAlphaHeight = aHeight;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
PR_LOG(gQTLogModule, QT_BASIC, ("nsImageQT::Init succeeded"));
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user