зеркало из https://github.com/mozilla/pjs.git
Support for Blending added. r=beard
This commit is contained in:
Родитель
9355e9d912
Коммит
6aef4d77aa
|
@ -273,7 +273,7 @@ NS_IMETHODIMP nsView :: Paint(nsIRenderingContext& rc, const nsRect& rect,
|
||||||
if (nsnull != mClientData) {
|
if (nsnull != mClientData) {
|
||||||
nsCOMPtr<nsIViewObserver> observer;
|
nsCOMPtr<nsIViewObserver> observer;
|
||||||
if (NS_OK == mViewManager->GetViewObserver(*getter_AddRefs(observer))) {
|
if (NS_OK == mViewManager->GetViewObserver(*getter_AddRefs(observer))) {
|
||||||
if ((mClip.mLeft != 0) && (mClip.mRight != 0) && (mClip.mTop != 0) && (mClip.mBottom != 0)) {
|
if ((mClip.mLeft != mClip.mRight) && (mClip.mTop != mClip.mBottom)) {
|
||||||
nsRect crect;
|
nsRect crect;
|
||||||
crect.x = mClip.mLeft;
|
crect.x = mClip.mLeft;
|
||||||
crect.y = mClip.mTop;
|
crect.y = mClip.mTop;
|
||||||
|
@ -972,9 +972,9 @@ NS_IMETHODIMP nsView :: SetClip(nscoord aLeft, nscoord aTop, nscoord aRight, nsc
|
||||||
NS_IMETHODIMP nsView :: GetClip(nscoord *aLeft, nscoord *aTop, nscoord *aRight, nscoord *aBottom,
|
NS_IMETHODIMP nsView :: GetClip(nscoord *aLeft, nscoord *aTop, nscoord *aRight, nscoord *aBottom,
|
||||||
PRBool &aResult) const
|
PRBool &aResult) const
|
||||||
{
|
{
|
||||||
if ((mClip.mLeft == 0) && (mClip.mRight == 0) && (mClip.mTop == 0) && (mClip.mBottom == 0))
|
if ((mClip.mLeft == mClip.mRight) || (mClip.mTop == mClip.mBottom)) {
|
||||||
aResult = PR_FALSE;
|
aResult = PR_FALSE;
|
||||||
else {
|
} else {
|
||||||
*aLeft = mClip.mLeft;
|
*aLeft = mClip.mLeft;
|
||||||
*aTop = mClip.mTop;
|
*aTop = mClip.mTop;
|
||||||
*aRight = mClip.mRight;
|
*aRight = mClip.mRight;
|
||||||
|
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -1,4 +1,4 @@
|
||||||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: true; c-basic-offset: 4 -*-
|
||||||
*
|
*
|
||||||
* The contents of this file are subject to the Netscape Public
|
* The contents of this file are subject to the Netscape Public
|
||||||
* License Version 1.1 (the "License"); you may not use this file
|
* License Version 1.1 (the "License"); you may not use this file
|
||||||
|
@ -240,7 +240,8 @@ private:
|
||||||
PRInt32 mDisplayListCount;
|
PRInt32 mDisplayListCount;
|
||||||
PRInt32 mOpaqueViewCount;
|
PRInt32 mOpaqueViewCount;
|
||||||
PRInt32 mTranslucentViewCount;
|
PRInt32 mTranslucentViewCount;
|
||||||
nsRect mTranslucentBounds;
|
nsRect mTranslucentArea; // bounding box of all translucent views.
|
||||||
|
nsSize mTranslucentSize; // size of the blending buffers.
|
||||||
nsIScrollableView *mRootScrollable;
|
nsIScrollableView *mRootScrollable;
|
||||||
|
|
||||||
//from here to public should be static and locked... MMP
|
//from here to public should be static and locked... MMP
|
||||||
|
@ -252,8 +253,8 @@ private:
|
||||||
static nsDrawingSurface gOffScreen;
|
static nsDrawingSurface gOffScreen;
|
||||||
static nsDrawingSurface gRed;
|
static nsDrawingSurface gRed;
|
||||||
static nsDrawingSurface gBlue;
|
static nsDrawingSurface gBlue;
|
||||||
static PRInt32 gBlendWidth;
|
static nsSize gOffScreenSize;
|
||||||
static PRInt32 gBlendHeight;
|
static nsSize gBlendSize;
|
||||||
|
|
||||||
//compositor regions
|
//compositor regions
|
||||||
nsIRegion *mTransRgn;
|
nsIRegion *mTransRgn;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче