mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Miscellaneous cleanup. b=232393 r+sr=roc

This commit is contained in:
dbaron%dbaron.org 2004-01-29 00:04:58 +00:00
Родитель 34cd8e8bdf
Коммит c44b201f8e
4 изменённых файлов: 29 добавлений и 64 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
view/src/nsView.cpp
Просмотреть файл

@ -292,11 +292,6 @@ NS_IMETHODIMP nsView::Paint(nsIRenderingContext& rc, const nsIRegion& region,
return NS_ERROR_NOT_IMPLEMENTED;
}
nsEventStatus nsView::HandleEvent(nsViewManager* aVM, nsGUIEvent *aEvent, PRBool aCaptured)
{
return aVM->HandleEvent(this, aEvent, aCaptured);
}
// XXX Start Temporary fix for Bug #19416
NS_IMETHODIMP nsView::IgnoreSetPosition(PRBool aShouldIgnore)
{
@ -772,10 +767,19 @@ NS_IMETHODIMP nsView::List(FILE* out, PRInt32 aIndent) const
nsRect brect = GetBounds();
fprintf(out, "{%d,%d,%d,%d}",
brect.x, brect.y, brect.width, brect.height);
if (IsZPlaceholderView()) {
fprintf(out, " z-placeholder(%p)",
(void*)NS_STATIC_CAST(const nsZPlaceholderView*, this)->GetReparentedView());
}
if (mZParent) {
fprintf(out, " zparent=%p", (void*)mZParent);
}
PRBool hasTransparency;
HasTransparency(hasTransparency);
fprintf(out, " z=%d vis=%d opc=%1.3f tran=%d clientData=%p <\n", mZIndex, mVis, mOpacity, hasTransparency, mClientData);
fprintf(out, " z=%d vis=%d opc=%1.3f tran=%d clientData=%p <\n",
mZIndex, mVis, mOpacity, hasTransparency, mClientData);
for (nsView* kid = mFirstChild; kid; kid = kid->GetNextSibling()) {
NS_ASSERTION(kid->GetParent() == this, "incorrect parent");
kid->List(out, aIndent + 1);
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);

15
view/src/nsView.h
Просмотреть файл

@ -124,19 +124,6 @@ public:
*/
NS_IMETHOD Paint(nsIRenderingContext& rc, const nsIRegion& region,
PRUint32 aPaintFlags, PRBool &aResult);
/**
* Called to indicate that the specified event should be handled
* by the view. This method should return nsEventStatus_eConsumeDoDefault
* or nsEventStatus_eConsumeNoDefault if the event has been handled.
*
* This is a hook giving the view a chance to handle the event specially.
* By default we just bounce the event back to the view manager for display
* list processing.
*
* @param event event to process
* @result processing status
*/
virtual nsEventStatus HandleEvent(nsViewManager* aVM, nsGUIEvent *aEvent, PRBool aCaptured);
/**
* Called to indicate that the position of the view has been changed.
@ -158,7 +145,7 @@ public:
* This checks whether the view is a placeholder for some view that has
* been reparented to a different geometric parent.
*/
virtual PRBool IsZPlaceholderView() { return PR_FALSE; }
virtual PRBool IsZPlaceholderView() const { return PR_FALSE; }
/**
* Called to set the clip of the children of this view.

56
view/src/nsViewManager.cpp
Просмотреть файл

@ -375,7 +375,7 @@ nsInvalidateEvent::nsInvalidateEvent(nsViewManager* aViewManager)
// Compare two Z-index values taking into account topmost and
// auto flags. the topmost flag is only used when both views are
// zindex:auto.
// zindex:auto. (XXXldb Lying!)
//
// returns 0 if equal
// > 0 if first z-index is greater than the second
@ -427,9 +427,9 @@ nsViewManager::nsViewManager()
if (gCleanupContext == nsnull) {
/* XXX: This should use a device to create a matching |nsIRenderingContext| object */
nsComponentManager::CreateInstance(kRenderingContextCID,
nsnull, NS_GET_IID(nsIRenderingContext), (void**)&gCleanupContext);
NS_ASSERTION(gCleanupContext != nsnull, "Wasn't able to create a graphics context for cleanup");
CallCreateInstance(kRenderingContextCID, &gCleanupContext);
NS_ASSERTION(gCleanupContext,
"Wasn't able to create a graphics context for cleanup");
}
gViewManagers->AppendElement(this);
@ -448,6 +448,12 @@ nsViewManager::nsViewManager()
nsViewManager::~nsViewManager()
{
if (mRootView) {
// Destroy any remaining views
mRootView->Destroy();
mRootView = nsnull;
}
nsCOMPtr<nsIEventQueue> eventQueue;
mEventQueueService->GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
getter_AddRefs(eventQueue));
@ -499,33 +505,7 @@ nsViewManager::~nsViewManager()
}
}
NS_IMPL_QUERY_INTERFACE1(nsViewManager, nsIViewManager)
NS_IMPL_ADDREF(nsViewManager)
nsrefcnt nsViewManager::Release(void)
{
/* Note funny ordering of use of mRefCnt. We were seeing a problem
during the deletion of a view hierarchy where child views,
while being destroyed, referenced this view manager and caused
the Destroy part of this method to be re-entered. Waiting until
the destruction has finished to decrement the refcount
prevents that.
*/
NS_LOG_RELEASE(this, mRefCnt - 1, "nsViewManager");
if (mRefCnt == 1)
{
if (nsnull != mRootView) {
// Destroy any remaining views
mRootView->Destroy();
mRootView = nsnull;
}
delete this;
return 0;
}
--mRefCnt;
return mRefCnt;
}
NS_IMPL_ISUPPORTS1(nsViewManager, nsIViewManager)
nsresult
nsViewManager::CreateRegion(nsIRegion* *result)
@ -2030,7 +2010,7 @@ NS_IMETHODIMP nsViewManager::DispatchEvent(nsGUIEvent *aEvent, nsEventStatus *aS
aEvent->point.x += offset.x;
aEvent->point.y += offset.y;
*aStatus = view->HandleEvent(this, aEvent, capturedEvent);
*aStatus = HandleEvent(view, aEvent, capturedEvent);
// From here on out, "this" could have been deleted!!!
@ -2182,7 +2162,7 @@ void nsViewManager::BuildDisplayList(nsView* aView, const nsRect& aRect, PRBool
} else {
paintFloats = displayRoot->GetFloating();
}
CreateDisplayList(displayRoot, PR_FALSE, zTree, PR_FALSE, origin.x, origin.y,
CreateDisplayList(displayRoot, PR_FALSE, zTree, origin.x, origin.y,
aView, &aRect, nsnull, displayRootOrigin.x, displayRootOrigin.y,
paintFloats, aEventProcessing);
@ -3198,14 +3178,11 @@ NS_IMETHODIMP nsViewManager::EnableRefresh(PRUint32 aUpdateFlags)
if (aUpdateFlags & NS_VMREFRESH_IMMEDIATE) {
ProcessPendingUpdates(mRootView);
mHasPendingInvalidates = PR_FALSE;
Composite();
} else {
PostInvalidateEvent();
}
if (aUpdateFlags & NS_VMREFRESH_IMMEDIATE) {
Composite();
}
return NS_OK;
}
@ -3371,7 +3348,7 @@ static nsresult EnsureZTreeNodeCreated(nsView* aView, DisplayZTreeNode* &aNode)
}
PRBool nsViewManager::CreateDisplayList(nsView *aView, PRBool aReparentedViewsPresent,
DisplayZTreeNode* &aResult, PRBool aInsideRealView,
DisplayZTreeNode* &aResult,
nscoord aOriginX, nscoord aOriginY, nsView *aRealView,
const nsRect *aDamageRect, nsView *aTopView,
nscoord aX, nscoord aY, PRBool aPaintFloats,
@ -3399,8 +3376,6 @@ PRBool nsViewManager::CreateDisplayList(nsView *aView, PRBool aReparentedViewsPr
pos = nsPoint(0, 0);
}
aInsideRealView = aInsideRealView || aRealView == aView,
// -> to global coordinates (relative to aTopView)
bounds.x += aX;
bounds.y += aY;
@ -3507,7 +3482,6 @@ PRBool nsViewManager::CreateDisplayList(nsView *aView, PRBool aReparentedViewsPr
childView = childView->GetNextSibling()) {
DisplayZTreeNode* createdNode;
retval = CreateDisplayList(childView, aReparentedViewsPresent, createdNode,
aInsideRealView,
aOriginX, aOriginY, aRealView, aDamageRect, aTopView, pos.x, pos.y, aPaintFloats,
aEventProcessing);
if (createdNode != nsnull) {

6
view/src/nsViewManager.h
Просмотреть файл

@ -100,9 +100,9 @@ public:
void RemoveReparentedView() { mReparentedView = nsnull; }
void SetReparentedView(nsView* aView) { mReparentedView = aView; }
nsView* GetReparentedView() { return mReparentedView; }
nsView* GetReparentedView() const { return mReparentedView; }
virtual PRBool IsZPlaceholderView() { return PR_TRUE; }
virtual PRBool IsZPlaceholderView() const { return PR_TRUE; }
protected:
virtual ~nsZPlaceholderView() {
@ -273,7 +273,7 @@ private:
PRBool CreateDisplayList(nsView *aView,
PRBool aReparentedViewsPresent, DisplayZTreeNode* &aResult,
nscoord aOriginX, nscoord aOriginY,
PRBool aInsideRealView, nsView *aRealView, const nsRect *aDamageRect,
nsView *aRealView, const nsRect *aDamageRect,
nsView *aTopView, nscoord aX, nscoord aY,
PRBool aPaintFloats, PRBool aEventProcessing);
PRBool AddToDisplayList(nsView *aView,