Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 316867 Should clean up the changed code by bug 55751 and bug 316715 r+sr=roc

Browse Source
This commit is contained in:
masayuki%d-toybox.com 2005-11-18 05:22:04 +00:00
parent 1de6ca2672
commit fd5514c77b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -3074,14 +3074,14 @@ nsGenericHTMLFormElement::GetDesiredIMEState()
nsCOMPtr<nsIEditor> editor = nsnull;
nsresult rv = GetEditorInternal(getter_AddRefs(editor));
if (NS_FAILED(rv) || !editor)
return nsIContent::GetDesiredIMEState();
return nsGenericHTMLElement::GetDesiredIMEState();
nsCOMPtr<nsIEditorIMESupport> imeEditor = do_QueryInterface(editor);
if (!imeEditor)
return nsIContent::GetDesiredIMEState();
return nsGenericHTMLElement::GetDesiredIMEState();
PRUint32 state;
rv = imeEditor->GetPreferredIMEState(&state);
if (NS_FAILED(rv))
return nsIContent::GetDesiredIMEState();
return nsGenericHTMLElement::GetDesiredIMEState();
return state;
}

4
content/html/content/src/nsHTMLAppletElement.cpp
View File

@ -330,8 +330,8 @@ nsHTMLAppletElement::IsFocusable(PRInt32 *aTabIndex)
PRUint32
nsHTMLAppletElement::GetDesiredIMEState()
{
if (nsObjectLoadingContent::Type() == eType_Plugin)
if (Type() == eType_Plugin)
return nsIContent::IME_STATUS_ENABLE;
return nsIContent::GetDesiredIMEState();
return nsGenericHTMLElement::GetDesiredIMEState();
}

4
content/html/content/src/nsHTMLSharedElement.cpp
View File

@ -610,7 +610,7 @@ PRUint32
nsHTMLSharedElement::GetDesiredIMEState()
{
if (mNodeInfo->Equals(nsHTMLAtoms::embed) &&
nsObjectLoadingContent::Type() == eType_Plugin)
Type() == eType_Plugin)
return nsIContent::IME_STATUS_ENABLE;
return nsIContent::GetDesiredIMEState();
return nsGenericHTMLElement::GetDesiredIMEState();
}