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

content/html/content/src/nsGenericHTMLElement.cpp

@@ -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;
 }
 

content/html/content/src/nsHTMLAppletElement.cpp

@@ -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();
 }
 

content/html/content/src/nsHTMLSharedElement.cpp

@@ -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();
 }