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

Checking in Jonas Sicking's <sicking@bigfoot.com> fix for bug 109154. Make this code not suck as much, don't use GetPrimaryFrame() when there's no need to. r=jkeiser@iname.com, sr=jst@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@107826 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com
2001-11-10 08:25:16 +00:00
parent ecfc39a688
commit 0936a7cef0
1 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mozilla/content/html/content/src/nsHTMLLabelElement.cpp
View File

@@ -334,7 +334,7 @@ nsHTMLLabelElement::HandleDOMEvent(nsIPresContext* aPresContext,
((nsEventStatus_eIgnore == *aEventStatus) ||
(nsEventStatus_eConsumeNoDefault == *aEventStatus)) ) {
PRBool isFormElement = PR_FALSE;
nsCOMPtr<nsIHTMLContent> node; // Node we are a label for
nsCOMPtr<nsIContent> content; // Node we are a label for
switch (aEvent->message) {
case NS_FOCUS_CONTENT:
@@ -372,19 +372,9 @@ nsHTMLLabelElement::HandleDOMEvent(nsIPresContext* aPresContext,
rv = domDoc->GetElementById(elementId,
getter_AddRefs(domElement));
}
if (NS_SUCCEEDED(rv) && domElement) {
// Get our grubby paws on the content interface
node = do_QueryInterface(domElement, &rv);
// Find out of this is a form element.
if (NS_SUCCEEDED(rv)) {
nsIFormControlFrame* control;
GetPrimaryFrame(node, control, PR_TRUE, PR_FALSE);
isFormElement = control != nsnull;
}
}
content = do_QueryInterface(domElement);
isFormElement = content &&
content->IsContentOfType(nsIContent::eHTML_FORM_CONTROL);
}
} else {
// --- No FOR attribute, we are a label for our first child
@@ -392,27 +382,12 @@ nsHTMLLabelElement::HandleDOMEvent(nsIPresContext* aPresContext,
PRInt32 numNodes;
rv = ChildCount(numNodes);
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIContent> contNode;
PRInt32 i;
for (i = 0; NS_SUCCEEDED(rv) && !isFormElement && (i < numNodes);
i++) {
rv = ChildAt(i, *getter_AddRefs(contNode));
if (NS_SUCCEEDED(rv) && contNode) {
// We need to make sure this child is a form element
nsresult isHTMLContent = PR_FALSE;
node = do_QueryInterface(contNode, &isHTMLContent);
if (NS_SUCCEEDED(isHTMLContent) && node) {
// Find out of this is a form element.
nsIFormControlFrame* control;
GetPrimaryFrame(node, control, PR_TRUE, PR_FALSE);
isFormElement = control != nsnull;
}
}
ChildAt(i, *getter_AddRefs(content));
isFormElement = content &&
content->IsContentOfType(nsIContent::eHTML_FORM_CONTROL);
}
}
}
@@ -420,12 +395,9 @@ nsHTMLLabelElement::HandleDOMEvent(nsIPresContext* aPresContext,
} // Close switch
// If we found an element, pass along the event to it.
if (NS_SUCCEEDED(rv) && node) {
// Only pass along event if this is a form element
if (isFormElement) {
rv = node->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, aFlags,
aEventStatus);
}
if (NS_SUCCEEDED(rv) && content && isFormElement) {
rv = content->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, aFlags,
aEventStatus);
}
} // Close trickery