зеркало из https://github.com/mozilla/pjs.git
Attempt to fix Firefox build bustage resulting from my last checkin.
This commit is contained in:
Родитель
d564e6f50b
Коммит
822ffb83a6
|
@ -1127,8 +1127,8 @@ static void SortByZOrder(DisplayZTreeNode *aNode, nsVoidArray &aBuffer, nsVoidAr
|
|||
// need to insert a POP for the last sequence and a PUSH for the next sequence
|
||||
DisplayListElement2 *newPop, *newPush;
|
||||
|
||||
PL_ARENA_ALLOCATE((void*)newPop, &aPool, sizeof(DisplayListElement2));
|
||||
PL_ARENA_ALLOCATE((void*)newPush, &aPool, sizeof(DisplayListElement2));
|
||||
PL_ARENA_ALLOCATE(NS_REINTERPRET_CAST(void*,newPop), &aPool, sizeof(DisplayListElement2));
|
||||
PL_ARENA_ALLOCATE(NS_REINTERPRET_CAST(void*,newPush), &aPool, sizeof(DisplayListElement2));
|
||||
|
||||
*newPop = *ePop;
|
||||
newPop->mZIndex = e->mZIndex;
|
||||
|
@ -3322,7 +3322,7 @@ NS_IMETHODIMP nsViewManager::ForceUpdate()
|
|||
static nsresult EnsureZTreeNodeCreated(nsView* aView, DisplayZTreeNode* &aNode, PLArenaPool &aPool)
|
||||
{
|
||||
if (nsnull == aNode) {
|
||||
PL_ARENA_ALLOCATE((void*)aNode, &aPool, sizeof(DisplayZTreeNode));
|
||||
PL_ARENA_ALLOCATE(NS_REINTERPRET_CAST(void*,aNode), &aPool, sizeof(DisplayZTreeNode));
|
||||
|
||||
if (nsnull == aNode) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
@ -3587,12 +3587,12 @@ PRBool nsViewManager::AddToDisplayList(nsView *aView,
|
|||
}
|
||||
|
||||
DisplayListElement2* element;
|
||||
PL_ARENA_ALLOCATE((void*)element, &aPool, sizeof(*element));
|
||||
PL_ARENA_ALLOCATE(NS_REINTERPRET_CAST(void*,element), &aPool, sizeof(*element));
|
||||
if (element == nsnull) {
|
||||
return PR_TRUE;
|
||||
}
|
||||
DisplayZTreeNode* node;
|
||||
PL_ARENA_ALLOCATE((void*)node, &aPool, sizeof(*node));
|
||||
PL_ARENA_ALLOCATE(NS_REINTERPRET_CAST(void*,node), &aPool, sizeof(*node));
|
||||
if (nsnull == node) {
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче