Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

beginnings of adding nsBlender support to mac build (r=pavlov).

Browse Source
This commit is contained in:
pinkerton%netscape.com 1999-12-01 22:01:27 +00:00
parent 0d11467346
commit e986659786
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gfx/macbuild/gfx.mcp
View File

Binary file not shown.

5
gfx/src/mac/nsGfxFactoryMac.cpp
View File

@ -33,6 +33,7 @@
#include "nsIImageManager.h"
#include "nsDeviceContextSpecMac.h"
#include "nsDeviceContextSpecFactoryM.h"
#include "nsBlender.h"
#include "nsCOMPtr.h"
static NS_DEFINE_IID(kCFontMetrics, NS_FONT_METRICS_CID);
@ -44,6 +45,7 @@ static NS_DEFINE_IID(kCScriptableRegion, NS_SCRIPTABLE_REGION_CID);
static NS_DEFINE_IID(kCDeviceContextSpec, NS_DEVICE_CONTEXT_SPEC_CID);
static NS_DEFINE_IID(kCDeviceContextSpecFactory, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID);
static NS_DEFINE_IID(kImageManagerImpl, NS_IMAGEMANAGER_CID);
static NS_DEFINE_IID(kCBlender, NS_BLENDER_CID);
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
@ -106,6 +108,9 @@ nsresult nsGfxFactoryMac::CreateInstance(nsISupports *aOuter,
else if (mClassID.Equals(kCRegion)) {
NS_NEWXPCOM(inst, nsRegionMac);
}
else if (mClassID.Equals(kCBlender)) {
NS_NEWXPCOM(inst, nsBlender);
}
else if (mClassID.Equals(kCScriptableRegion)) {
nsCOMPtr<nsIRegion> rgn;
NS_NEWXPCOM(rgn, nsRegionMac);

12
gfx/src/mac/nsRenderingContextMac.cpp
View File

@ -361,14 +361,22 @@ NS_IMETHODIMP nsRenderingContextMac::LockDrawingSurface(PRInt32 aX, PRInt32 aY,
void **aBits, PRInt32 *aStride,
PRInt32 *aWidthBytes, PRUint32 aFlags)
{
return NS_OK;
PushState();
return mCurrentSurface->Lock(aX, aY, aWidth, aHeight,
aBits, aStride, aWidthBytes, aFlags);
}
//------------------------------------------------------------------------
NS_IMETHODIMP nsRenderingContextMac::UnlockDrawingSurface(void)
{
return NS_OK;
PRBool clipstate;
PopState(clipstate);
mCurrentSurface->Unlock();
return NS_OK;
}
//------------------------------------------------------------------------