Bug 564411 Move all methods/attributes of nsIEditorIMESupport to nsIEditor r=smaug

Doing QI from nsIEditor to nsIEditorIMESupport doesn't make sense because editor should always support all methods and attributes of nsIEditorIMESupport (it does NOT mean that all nsIEditor implementation need to support IME).

This patch moves all of them to nsIEditor for avoiding redundant QIs.

MozReview-Commit-ID: DzIKuGHG4iy
This commit is contained in:
Masayuki Nakano
2016-12-20 21:47:31 +09:00
parent 49021144fd
commit e8e68353a3
24 changed files with 88 additions and 132 deletions

View File

@@ -13,7 +13,6 @@
#include "nsCSSPseudoElements.h"
#include "nsGenericHTMLElement.h"
#include "nsIEditor.h"
#include "nsIEditorIMESupport.h"
#include "nsIPhonetic.h"
#include "nsTextFragment.h"
#include "nsIDOMHTMLTextAreaElement.h"
@@ -1207,11 +1206,9 @@ nsTextControlFrame::GetPhonetic(nsAString& aPhonetic)
nsresult rv = GetEditor(getter_AddRefs(editor));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIEditorIMESupport> imeSupport = do_QueryInterface(editor);
if (imeSupport) {
nsCOMPtr<nsIPhonetic> phonetic = do_QueryInterface(imeSupport);
if (phonetic)
phonetic->GetPhonetic(aPhonetic);
nsCOMPtr<nsIPhonetic> phonetic = do_QueryInterface(editor);
if (phonetic) {
phonetic->GetPhonetic(aPhonetic);
}
return NS_OK;
}