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

Bug 362074 - ns*TextFieldAccessible::CheckForEditor should use nsIDOMNSEditableElement. r=aaronlev.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@216063 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla.mano%sent.com
2006-11-29 16:10:31 +00:00
parent d7f9b6cd06
commit ddb8fb3dc3
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp
View File

@@ -41,6 +41,7 @@
#include "nsAccessibilityAtoms.h"
#include "nsHTMLFormControlAccessible.h"
#include "nsIDOMHTMLInputElement.h"
#include "nsIDOMNSEditableElement.h"
#include "nsIDOMNSHTMLButtonElement.h"
#include "nsIDOMHTMLLegendElement.h"
#include "nsIDOMHTMLTextAreaElement.h"
@@ -417,15 +418,15 @@ void nsHTMLTextFieldAccessible::SetEditor(nsIEditor* aEditor)
void nsHTMLTextFieldAccessible::CheckForEditor()
{
nsIFrame *frame = GetFrame();
if (frame) {
nsITextControlFrame *textFrame;
frame->QueryInterface(NS_GET_IID(nsITextControlFrame), (void**)&textFrame);
if (textFrame) {
nsCOMPtr<nsIEditor> editor;
textFrame->GetEditor(getter_AddRefs(editor));
SetEditor(editor);
}
nsCOMPtr<nsIDOMNSEditableElement> editableElt(do_QueryInterface(mDOMNode));
if (!editableElt) {
return;
}
nsCOMPtr<nsIEditor> editor;
nsresult rv = editableElt->GetEditor(getter_AddRefs(editor));
if (NS_SUCCEEDED(rv)) {
SetEditor(editor);
}
}

22
mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp
View File

@@ -43,6 +43,7 @@
#include "nsAccessibilityAtoms.h"
#include "nsAccessibleTreeWalker.h"
#include "nsIDOMHTMLInputElement.h"
#include "nsIDOMNSEditableElement.h"
#include "nsIDOMXULButtonElement.h"
#include "nsIDOMXULCheckboxElement.h"
#include "nsIDOMXULMenuListElement.h"
@@ -797,23 +798,18 @@ void nsXULTextFieldAccessible::CheckForEditor()
nsCOMPtr<nsIDOMNode> inputField;
textBox->GetInputField(getter_AddRefs(inputField));
nsCOMPtr<nsIContent> inputContent = do_QueryInterface(inputField);
if (!inputContent) {
if (!inputField) {
return;
}
nsCOMPtr<nsIPresShell> presShell = GetPresShell();
nsIFrame *inputFrame = presShell->GetPrimaryFrameFor(inputContent);
if (!inputFrame) {
nsCOMPtr<nsIDOMNSEditableElement> editableElt(do_QueryInterface(inputField));
if (!editableElt) {
return;
}
nsITextControlFrame *textFrame;
inputFrame->QueryInterface(NS_GET_IID(nsITextControlFrame), (void**)&textFrame);
if (textFrame) {
nsCOMPtr<nsIEditor> editor;
textFrame->GetEditor(getter_AddRefs(editor));
nsCOMPtr<nsIEditor> editor;
nsresult rv = editableElt->GetEditor(getter_AddRefs(editor));
if (NS_SUCCEEDED(rv)) {
SetEditor(editor);
}
}