зеркало из https://github.com/mozilla/gecko-dev.git
use PR_LOG for debugging
This commit is contained in:
Родитель
2007f6c72d
Коммит
491cc36d07
|
@ -30,10 +30,12 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
|
|||
static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID);
|
||||
static NS_DEFINE_IID(kDeviceContextIID, NS_IDEVICE_CONTEXT_IID);
|
||||
|
||||
static PRLogModuleInfo *DeviceContextXlibLM = PR_NewLogModule("DeviceContextXlib");
|
||||
|
||||
nsDeviceContextXlib::nsDeviceContextXlib()
|
||||
: DeviceContextImpl()
|
||||
{
|
||||
printf("nsDeviceContextXlib::nsDeviceContextXlib()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::nsDeviceContextXlib()\n"));
|
||||
NS_INIT_REFCNT();
|
||||
mTwipsToPixels = 1.0;
|
||||
mPixelsToTwips = 1.0;
|
||||
|
@ -54,7 +56,7 @@ nsDeviceContextXlib::~nsDeviceContextXlib()
|
|||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::Init(nsNativeWidget aNativeWidget)
|
||||
{
|
||||
printf("nsDeviceContextXlib::Init()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::Init()\n"));
|
||||
|
||||
mWidget = aNativeWidget;
|
||||
|
||||
|
@ -95,14 +97,14 @@ nsDeviceContextXlib::CommonInit(void)
|
|||
mTwipsToPixels = float(dpi) / float(NSIntPointsToTwips(72));
|
||||
mPixelsToTwips = 1.0f / mTwipsToPixels;
|
||||
|
||||
// printf("GFX: dpi=%d t2p=%g p2t=%g\n", dpi, mTwipsToPixels, mPixelsToTwips);
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("GFX: dpi=%d t2p=%g p2t=%g\n", dpi, mTwipsToPixels, mPixelsToTwips));
|
||||
|
||||
DeviceContextImpl::CommonInit();
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::CreateRenderingContext(nsIRenderingContext *&aContext)
|
||||
{
|
||||
printf("nsDeviceContextXlib::CreateRenderingContext()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::CreateRenderingContext()\n"));
|
||||
|
||||
nsIRenderingContext *context = nsnull;
|
||||
nsDrawingSurfaceXlib *surface = nsnull;
|
||||
|
@ -138,14 +140,14 @@ NS_IMETHODIMP nsDeviceContextXlib::CreateRenderingContext(nsIRenderingContext *&
|
|||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::SupportsNativeWidgets(PRBool &aSupportsWidgets)
|
||||
{
|
||||
printf("nsDeviceContextXlib::SupportsNativeWidgets()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::SupportsNativeWidgets()\n"));
|
||||
aSupportsWidgets = PR_TRUE;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::GetScrollBarDimensions(float &aWidth, float &aHeight) const
|
||||
{
|
||||
printf("nsDeviceContextXlib::GetScrollBarDimensions()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::GetScrollBarDimensions()\n"));
|
||||
// XXX Oh, yeah. These are hard coded.
|
||||
aWidth = 5 * mPixelsToTwips;
|
||||
aHeight = 5 * mPixelsToTwips;
|
||||
|
@ -155,7 +157,7 @@ NS_IMETHODIMP nsDeviceContextXlib::GetScrollBarDimensions(float &aWidth, float &
|
|||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const
|
||||
{
|
||||
printf("nsDeviceContextXlib::GetSystemAttribute()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::GetSystemAttribute()\n"));
|
||||
nsresult status = NS_OK;
|
||||
|
||||
switch (anID) {
|
||||
|
@ -241,7 +243,7 @@ NS_IMETHODIMP nsDeviceContextXlib::GetSystemAttribute(nsSystemAttrID anID, Syste
|
|||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::GetDrawingSurface(nsIRenderingContext &aContext, nsDrawingSurface &aSurface)
|
||||
{
|
||||
printf("nsDeviceContextXlib::GetDrawingSurface()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::GetDrawingSurface()\n"));
|
||||
if (NULL == mSurface) {
|
||||
aContext.CreateDrawingSurface(nsnull, 0, mSurface);
|
||||
}
|
||||
|
@ -255,14 +257,14 @@ NS_IMETHODIMP nsDeviceContextXlib::GetDrawingSurface(nsIRenderingContext &aConte
|
|||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::ConvertPixel(nscolor aColor, PRUint32 & aPixel)
|
||||
{
|
||||
printf("nsDeviceContextXlib::ConvertPixel()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::ConvertPixel()\n"));
|
||||
aPixel = xlib_rgb_xpixel_from_rgb(aPixel);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::CheckFontExistence(const nsString& aFontName)
|
||||
{
|
||||
printf("nsDeviceContextXlib::CheckFontExistence()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::CheckFontExistence()\n"));
|
||||
char **fnames = nsnull;
|
||||
PRInt32 namelen = aFontName.Length() + 1;
|
||||
char *wildstring = (char *)PR_Malloc(namelen + 200);
|
||||
|
@ -301,7 +303,7 @@ NS_IMETHODIMP nsDeviceContextXlib::CheckFontExistence(const nsString& aFontName)
|
|||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRInt32 &aHeight)
|
||||
{
|
||||
printf("nsDeviceContextXlib::GetDeviceSurfaceDimensions()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::GetDeviceSurfaceDimensions()\n"));
|
||||
aWidth = 1;
|
||||
aHeight = 1;
|
||||
return NS_OK;
|
||||
|
@ -310,7 +312,7 @@ NS_IMETHODIMP nsDeviceContextXlib::GetDeviceSurfaceDimensions(PRInt32 &aWidth, P
|
|||
NS_IMETHODIMP nsDeviceContextXlib::GetDeviceContextFor(nsIDeviceContextSpec *aDevice,
|
||||
nsIDeviceContext *&aContext)
|
||||
{
|
||||
printf("nsDeviceContextXlib::GetDeviceContextFor()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::GetDeviceContextFor()\n"));
|
||||
aContext = new nsDeviceContextPS();
|
||||
((nsDeviceContextPS *)aContext)->SetSpec(aDevice);
|
||||
NS_ADDREF(aDevice);
|
||||
|
@ -319,24 +321,24 @@ NS_IMETHODIMP nsDeviceContextXlib::GetDeviceContextFor(nsIDeviceContextSpec *aDe
|
|||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::BeginDocument(void)
|
||||
{
|
||||
printf("nsDeviceContextXlib::BeginDocument()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::BeginDocument()\n"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::EndDocument(void)
|
||||
{
|
||||
printf("nsDeviceContextXlib::EndDocument()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::EndDocument()\n"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::BeginPage(void)
|
||||
{
|
||||
printf("nsDeviceContextXlib::BeginPage()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::BeginPage()\n"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsDeviceContextXlib::EndPage(void)
|
||||
{
|
||||
printf("nsDeviceContextXlib::EndPage()\n");
|
||||
PR_LOG(DeviceContextXlibLM, PR_LOG_DEBUG, ("nsDeviceContextXlib::EndPage()\n"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
@ -17,9 +17,12 @@
|
|||
*/
|
||||
|
||||
#include "nsDrawingSurfaceXlib.h"
|
||||
#include "prlog.h"
|
||||
|
||||
static NS_DEFINE_IID(kIDrawingSurfaceIID, NS_IDRAWING_SURFACE_IID);
|
||||
|
||||
static PRLogModuleInfo *DrawingSurfaceXlibLM = PR_NewLogModule("DrawingSurfaceXlib");
|
||||
|
||||
extern Display *gDisplay;
|
||||
extern Screen *gScreen;
|
||||
extern int gScreenNum;
|
||||
|
@ -47,7 +50,7 @@ extern PRUint8 gAlphaShift; //number to shift value into alpha position
|
|||
nsDrawingSurfaceXlib::nsDrawingSurfaceXlib()
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
printf("nsDrawingSurfaceXlib::nsDrawingSurfaceXlib()\n");
|
||||
PR_LOG(DrawingSurfaceXlibLM, PR_LOG_DEBUG, ("nsDrawingSurfaceXlib::nsDrawingSurfaceXlib()\n"));
|
||||
mDrawable = 0;
|
||||
mDestroyDrawable = PR_FALSE;
|
||||
mImage = nsnull;
|
||||
|
@ -80,7 +83,7 @@ nsDrawingSurfaceXlib::nsDrawingSurfaceXlib()
|
|||
|
||||
nsDrawingSurfaceXlib::~nsDrawingSurfaceXlib()
|
||||
{
|
||||
printf("nsDrawingSurfaceXlib::~nsDrawingSurfaceXlib()\n");
|
||||
PR_LOG(DrawingSurfaceXlibLM, PR_LOG_DEBUG, ("nsDrawingSurfaceXlib::~nsDrawingSurfaceXlib()\n"));
|
||||
// if it's been labeled as destroy, it's a pixmap.
|
||||
if (mDestroyDrawable) {
|
||||
XFreePixmap(gDisplay, mDrawable);
|
||||
|
@ -96,7 +99,7 @@ NS_IMPL_RELEASE(nsDrawingSurfaceXlib)
|
|||
|
||||
NS_IMETHODIMP
|
||||
nsDrawingSurfaceXlib::Init(Drawable aDrawable, GC aGC) {
|
||||
printf("nsDrawingSurfaceXlib::Init()\n");
|
||||
PR_LOG(DrawingSurfaceXlibLM, PR_LOG_DEBUG, ("nsDrawingSurfaceXlib::Init()\n"));
|
||||
mGC = aGC;
|
||||
mDrawable = aDrawable;
|
||||
mIsOffscreen = PR_FALSE;
|
||||
|
@ -124,7 +127,7 @@ nsDrawingSurfaceXlib::Lock(PRInt32 aX, PRInt32 aY,
|
|||
void **aBits, PRInt32 *aStride,
|
||||
PRInt32 *aWidthBytes, PRUint32 aFlags)
|
||||
{
|
||||
printf("nsDrawingSurfaceXlib::Lock()\n");
|
||||
PR_LOG(DrawingSurfaceXlibLM, PR_LOG_DEBUG, ("nsDrawingSurfaceXlib::Lock()\n"));
|
||||
if (mLocked)
|
||||
{
|
||||
NS_ASSERTION(0, "nested lock attempt");
|
||||
|
@ -155,7 +158,7 @@ nsDrawingSurfaceXlib::Lock(PRInt32 aX, PRInt32 aY,
|
|||
NS_IMETHODIMP
|
||||
nsDrawingSurfaceXlib::Unlock(void)
|
||||
{
|
||||
printf("nsDrawingSurfaceXlib::UnLock()\n");
|
||||
PR_LOG(DrawingSurfaceXlibLM, PR_LOG_DEBUG, ("nsDrawingSurfaceXlib::UnLock()\n"));
|
||||
if (!mLocked) {
|
||||
NS_ASSERTION(0, "attempting to unlock an DS that isn't locked");
|
||||
return NS_ERROR_FAILURE;
|
||||
|
|
|
@ -19,12 +19,15 @@
|
|||
#include "nsImageXlib.h"
|
||||
#include "nsDrawingSurfaceXlib.h"
|
||||
#include "xlibrgb.h"
|
||||
#include "prlog.h"
|
||||
|
||||
static NS_DEFINE_IID(kIImageIID, NS_IIMAGE_IID);
|
||||
|
||||
static PRLogModuleInfo *ImageXlibLM = PR_NewLogModule("ImageXlib");
|
||||
|
||||
nsImageXlib::nsImageXlib()
|
||||
{
|
||||
// printf("nsImageXlib::nsImageXlib()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::nsImageXlib()\n"));
|
||||
NS_INIT_REFCNT();
|
||||
mImageBits = nsnull;
|
||||
mAlphaBits = nsnull;
|
||||
|
@ -46,7 +49,7 @@ nsImageXlib::nsImageXlib()
|
|||
|
||||
nsImageXlib::~nsImageXlib()
|
||||
{
|
||||
//printf("nsImageXlib::nsImageXlib()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG,("nsImageXlib::nsImageXlib()\n"));
|
||||
if (nsnull != mImageBits) {
|
||||
delete[] mImageBits;
|
||||
mImageBits = nsnull;
|
||||
|
@ -68,28 +71,28 @@ NS_IMPL_ISUPPORTS(nsImageXlib, kIImageIID);
|
|||
PRInt32
|
||||
nsImageXlib::GetHeight()
|
||||
{
|
||||
// printf("nsImageXlib::GetHeight()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetHeight()\n"));
|
||||
return mHeight;
|
||||
}
|
||||
|
||||
PRInt32
|
||||
nsImageXlib::GetWidth()
|
||||
{
|
||||
// printf("nsImageXlib::GetWidth()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetWidth()\n"));
|
||||
return mWidth;
|
||||
}
|
||||
|
||||
PRUint8*
|
||||
nsImageXlib::GetBits()
|
||||
{
|
||||
// printf("nsImageXlib::GetBits()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetBits()\n"));
|
||||
return mImageBits;
|
||||
}
|
||||
|
||||
PRInt32
|
||||
nsImageXlib::GetLineStride()
|
||||
{
|
||||
// printf("nsImageXlib::GetLineStride()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetLineStride()\n"));
|
||||
return mRowBytes;
|
||||
}
|
||||
|
||||
|
@ -99,7 +102,7 @@ nsImageXlib::Draw(nsIRenderingContext &aContext,
|
|||
PRInt32 aX, PRInt32 aY,
|
||||
PRInt32 aWidth, PRInt32 aHeight)
|
||||
{
|
||||
printf("nsImageXlib::Draw()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::Draw()\n"));
|
||||
// XXX from gtk code: this is temporary until the
|
||||
// height/width args are removed from the draw method
|
||||
if ((aWidth != mWidth) || (aHeight != mHeight)) {
|
||||
|
@ -188,7 +191,7 @@ nsImageXlib::Draw(nsIRenderingContext &aContext,
|
|||
PRInt32 aDX, PRInt32 aDY,
|
||||
PRInt32 aDWidth, PRInt32 aDHeight)
|
||||
{
|
||||
printf("nsImageXlib::Draw()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::Draw()\n"));
|
||||
nsDrawingSurfaceXlib *drawing = (nsDrawingSurfaceXlib *)aSurface;
|
||||
xlib_draw_rgb_image (drawing->GetDrawable(),
|
||||
drawing->GetGC(),
|
||||
|
@ -203,7 +206,7 @@ nsImageXlib::Draw(nsIRenderingContext &aContext,
|
|||
nsColorMap*
|
||||
nsImageXlib::GetColorMap()
|
||||
{
|
||||
printf("nsImageXlib::GetColorMap()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetColorMap()\n"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -211,7 +214,7 @@ void
|
|||
nsImageXlib::ImageUpdated(nsIDeviceContext *aContext,
|
||||
PRUint8 aFlags, nsRect *aUpdateRect)
|
||||
{
|
||||
printf("nsImageXlib::ImageUpdated()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::ImageUpdated()\n"));
|
||||
if (nsImageUpdateFlags_kBitsChanged & aFlags) {
|
||||
if (mAlphaPixmap != 0) {
|
||||
XFreePixmap(gDisplay, mAlphaPixmap);
|
||||
|
@ -228,7 +231,7 @@ nsresult
|
|||
nsImageXlib::Init(PRInt32 aWidth, PRInt32 aHeight,
|
||||
PRInt32 aDepth, nsMaskRequirements aMaskRequirements)
|
||||
{
|
||||
printf("nsImageXlib::Init()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::Init()\n"));
|
||||
|
||||
if (nsnull != mImageBits) {
|
||||
delete[] mImageBits;
|
||||
|
@ -295,49 +298,49 @@ nsImageXlib::Init(PRInt32 aWidth, PRInt32 aHeight,
|
|||
PRBool
|
||||
nsImageXlib::IsOptimized()
|
||||
{
|
||||
// printf("nsImageXlib::IsOptimized()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::IsOptimized()\n"));
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsImageXlib::Optimize(nsIDeviceContext* aContext)
|
||||
{
|
||||
// printf("nsImageXlib::Optimize()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::Optimize()\n"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
PRUint8*
|
||||
nsImageXlib::GetAlphaBits()
|
||||
{
|
||||
// printf("nsImageXlib::GetAlphaBits()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetAlphaBits()\n"));
|
||||
return mAlphaBits;
|
||||
}
|
||||
|
||||
PRInt32
|
||||
nsImageXlib::GetAlphaWidth()
|
||||
{
|
||||
// printf("nsImageXlib::GetAlphaWidth()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetAlphaWidth()\n"));
|
||||
return mAlphaWidth;
|
||||
}
|
||||
|
||||
PRInt32
|
||||
nsImageXlib::GetAlphaHeight()
|
||||
{
|
||||
// printf("nsImageXlib::GetAlphaHeight()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetAlphaHeight()\n"));
|
||||
return mAlphaHeight;
|
||||
}
|
||||
|
||||
PRInt32
|
||||
nsImageXlib::GetAlphaLineStride()
|
||||
{
|
||||
// printf("nsImageXlib::GetAlphaLineStride()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetAlphaLineStride()\n"));
|
||||
return mAlphaRowBytes;
|
||||
}
|
||||
|
||||
PRInt32
|
||||
nsImageXlib::CalcBytesSpan(PRUint32 aWidth)
|
||||
{
|
||||
// printf("nsImageXlib::CalcBytesSpan()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::CalcBytesSpan()\n"));
|
||||
PRInt32 spanbytes;
|
||||
|
||||
spanbytes = (aWidth * mDepth) >> 5;
|
||||
|
@ -351,13 +354,13 @@ nsImageXlib::CalcBytesSpan(PRUint32 aWidth)
|
|||
void
|
||||
nsImageXlib::SetAlphaLevel(PRInt32 aAlphaLevel)
|
||||
{
|
||||
// printf("nsImageXlib::SetAlphaLevel()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::SetAlphaLevel()\n"));
|
||||
return;
|
||||
}
|
||||
|
||||
PRInt32 nsImageXlib::GetAlphaLevel()
|
||||
{
|
||||
// printf("nsImageXlib::GetAlphaLevel()\n");
|
||||
PR_LOG(ImageXlibLM, PR_LOG_DEBUG, ("nsImageXlib::GetAlphaLevel()\n"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче