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

Fix smoketest blocker bugs 71224 & 71836 and (probably) 71834. r: hyatt

This commit is contained in:
joki%netscape.com 2001-03-13 23:58:15 +00:00
Родитель 93a5700527
Коммит 6f9ce0e10e
3 изменённых файлов: 17 добавлений и 71 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

27
content/base/src/nsGenericDOMDataNode.cpp
Просмотреть файл

@ -670,29 +670,12 @@ nsGenericDOMDataNode::HandleDOMEvent(nsIPresContext* aPresContext,
//Capturing stage evaluation
if (NS_EVENT_FLAG_BUBBLE != aFlags) {
//Initiate capturing phase. Special case first call to document
if (NS_EVENT_FLAG_INIT & aFlags) {
//Set flag to PR_TRUE here so capture will still work even with no document. If
//the document is there and correctly has no capturers it will reset back to false.
intermediateCapture = PR_TRUE;
if (mDocument) {
mDocument->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
//Now check for the presence of intermediate capturers registered at document;
intermediateCapture = mDocument->EventCaptureRegistration(0);
}
//If intermediate capturers exist, pass capturing up the tree before local evaulation
if (intermediateCapture && mParent) {
// Pass off to our parent.
mParent->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
if (mParent) {
mParent->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
else {
//If we've been called during the event capture phase when the event didn't initiate on this element
//then intermediate capturers must exist. Pass capturing up the tree before local evaulation.
if (mParent) {
mParent->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
else if (mDocument != nsnull) {
ret = mDocument->HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
}

28
content/base/src/nsGenericElement.cpp
Просмотреть файл

@ -1324,7 +1324,6 @@ nsGenericElement::GetNodeInfo(nsINodeInfo*& aResult) const
return NS_OK;
}
nsresult
nsGenericElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
@ -1396,29 +1395,12 @@ nsGenericElement::HandleDOMEvent(nsIPresContext* aPresContext,
//Capturing stage evaluation
if (NS_EVENT_FLAG_BUBBLE != aFlags) {
//Initiate capturing phase. Special case first call to document
if (NS_EVENT_FLAG_INIT & aFlags) {
//Set flag to PR_TRUE here so capture will still work even with no document. If
//the document is there and correctly has no capturers it will reset back to false.
intermediateCapture = PR_TRUE;
if (mDocument) {
mDocument->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
//Now check for the presence of intermediate capturers registered at document;
intermediateCapture = mDocument->EventCaptureRegistration(0);
}
//If intermediate capturers exist, pass capturing up the tree before local evaulation
if (intermediateCapture && mParent) {
// Pass off to our parent.
mParent->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
if (mParent) {
mParent->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
else {
//If we've been called during the event capture phase when the event didn't initiate on this element
//then intermediate capturers must exist. Pass capturing up the tree before local evaulation.
if (mParent) {
mParent->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
else if (mDocument != nsnull) {
ret = mDocument->HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
}

33
content/xul/content/src/nsXULElement.cpp
Просмотреть файл

@ -3498,8 +3498,6 @@ nsXULElement::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const
return NS_OK;
}
NS_IMETHODIMP
nsXULElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
@ -3603,35 +3601,18 @@ nsXULElement::HandleDOMEvent(nsIPresContext* aPresContext,
privateEvent->SetTarget(target);
}
PRBool intermediateCapture = PR_TRUE;
//Capturing stage evaluation
if (NS_EVENT_FLAG_BUBBLE != aFlags) {
//Initiate capturing phase. Special case first call to document
if (NS_EVENT_FLAG_INIT & aFlags) {
//Set flag to PR_TRUE here so capture will still work even with no document. If
//the document is there and correctly has no capturers it will reset back to false.
intermediateCapture = PR_TRUE;
if (mDocument) {
mDocument->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
//Now check for the presence of intermediate capturers registered at document;
intermediateCapture = mDocument->EventCaptureRegistration(0);
}
//If intermediate capturers exist, pass capturing up the tree before local evaulation
if (intermediateCapture && mParent) {
// Pass off to our parent.
mParent->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
if (mParent) {
mParent->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
else {
//If we've been called during the event capture phase when the event didn't initiate on this element
//then intermediate capturers must exist. Pass capturing up the tree before local evaulation.
if (mParent) {
mParent->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
else if (mDocument != nsnull) {
ret = mDocument->HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
}
}
if (retarget) {
// The event originated beneath us, and we performed a retargeting.