Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 10:27:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 617539 - Remove nsIEditor_MOZILLA_2_0_BRANCH; r=roc

Browse Source
This commit is contained in:
Ehsan Akhgari 2011-04-11 16:00:32 -04:00
parent 1b9d968e1c
commit 09eee51632
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -897,10 +897,8 @@ nsTextInputListener::EditAction()
}
// Fire input event
nsCOMPtr<nsIEditor_MOZILLA_2_0_BRANCH> editor20 = do_QueryInterface(editor);
NS_ASSERTION(editor20, "Something is very wrong!");
PRBool trusted = PR_FALSE;
editor20->GetLastKeypressEventTrusted(&trusted);
editor->GetLastKeypressEventTrusted(&trusted);
frame->FireOnInput(trusted);
// mFrame may be dead after this, but we don't need to check for it, because

6
editor/idl/nsIEditor.idl
View File

@ -55,7 +55,7 @@ interface nsIEditActionListener;
interface nsIInlineSpellChecker;
interface nsITransferable;
[scriptable, uuid(78b0bde0-ab69-428b-ab30-fcc09eead499)]
[scriptable, uuid(bd5d93f0-6451-11e0-ae3e-0800200c9a66)]
interface nsIEditor : nsISupports
{
@ -572,11 +572,7 @@ interface nsIEditor : nsISupports
/* checks if a node is read-only or not */
[notxpcom] boolean isModifiableNode(in nsIDOMNode aNode);
};
[uuid(54c0bc08-6c0e-4967-bb0d-ec991d78a8b3)]
interface nsIEditor_MOZILLA_2_0_BRANCH : nsISupports
{
/**
* Will be set to true if the last keypress event that the editor has handled
* has been trusted. The value will only be valid when the edit action listeners

1
editor/libeditor/base/nsEditor.cpp
View File

@ -205,7 +205,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsEditor)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEditor)
NS_INTERFACE_MAP_ENTRY(nsIEditor_MOZILLA_2_0_BRANCH)
NS_INTERFACE_MAP_ENTRY(nsIPhonetic)
NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
NS_INTERFACE_MAP_ENTRY(nsIEditorIMESupport)

6
editor/libeditor/base/nsEditor.h
View File

@ -100,8 +100,7 @@ class nsIDOMNSEvent;
class nsEditor : public nsIEditor,
public nsIEditorIMESupport,
public nsSupportsWeakReference,
public nsIPhonetic,
public nsIEditor_MOZILLA_2_0_BRANCH
public nsIPhonetic
{
public:
@ -157,9 +156,6 @@ public:
// nsIPhonetic
NS_DECL_NSIPHONETIC
// nsIEditor_MOZILLA_2_0_BRANCH
NS_DECL_NSIEDITOR_MOZILLA_2_0_BRANCH
public: