Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for 54524. r=attinasi,waterson a=waterson. Also checking in patch

Browse Source 
to nsXBLPrototypeHandler.cpp that went into the branch days ago (but that
I forgot to check in to the trunk).


git-svn-id: svn://10.0.0.236/trunk@80218 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%netscape.com 2000-10-02 22:25:45 +00:00
parent a0c82c648b
commit 899b919046
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
View File

@ -402,7 +402,7 @@ nsXBLPrototypeHandler::MouseEventMatched(nsIAtom* aEventType, nsIDOMMouseEvent*
unsigned short button;
aMouseEvent->GetButton(&button);
if (mDetail != 0 && (button != mDetail)) {
if (mDetail != -1 && (button != mDetail)) {
*aResult = PR_FALSE;
return NS_OK;
}

7
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@ -10974,7 +10974,12 @@ keepLooking:
// child frames, too.
// We also need to search the child frame's children if the child frame
// is a "special" frame
if (kidContent.get() == aParentContent || IsFrameSpecial(kidFrame)) {
// We also need to search if the child content is anonymous and scoped
// to the parent content.
nsCOMPtr<nsIContent> parentScope;
kidContent->GetBindingParent(getter_AddRefs(parentScope));
if (kidContent.get() == aParentContent || IsFrameSpecial(kidFrame) ||
(aParentContent && (aParentContent == parentScope.get()))) {
nsIFrame* matchingFrame = FindFrameWithContent(aPresContext, kidFrame, aParentContent,
aContent);

7
mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -10974,7 +10974,12 @@ keepLooking:
// child frames, too.
// We also need to search the child frame's children if the child frame
// is a "special" frame
if (kidContent.get() == aParentContent || IsFrameSpecial(kidFrame)) {
// We also need to search if the child content is anonymous and scoped
// to the parent content.
nsCOMPtr<nsIContent> parentScope;
kidContent->GetBindingParent(getter_AddRefs(parentScope));
if (kidContent.get() == aParentContent || IsFrameSpecial(kidFrame) ||
(aParentContent && (aParentContent == parentScope.get()))) {
nsIFrame* matchingFrame = FindFrameWithContent(aPresContext, kidFrame, aParentContent,
aContent);

2
mozilla/layout/xbl/src/nsXBLPrototypeHandler.cpp
View File

@ -402,7 +402,7 @@ nsXBLPrototypeHandler::MouseEventMatched(nsIAtom* aEventType, nsIDOMMouseEvent*
unsigned short button;
aMouseEvent->GetButton(&button);
if (mDetail != 0 && (button != mDetail)) {
if (mDetail != -1 && (button != mDetail)) {
*aResult = PR_FALSE;
return NS_OK;
}