author | Ehsan Akhgari <ehsan@mozilla.com> |
Mon, 11 Apr 2011 16:00:32 -0400 | |
changeset 67852 | a7ba826ccbdfd5f0c64d4f1b72b82feaf59fa74b |
parent 67851 | 3aebb305dee58be2747dc523b2f31d3829bad100 |
child 67853 | 0d60751c978e2e899cfa36da8a49e84a75456119 |
push id | 1 |
push user | root |
push date | Tue, 26 Apr 2011 22:38:44 +0000 |
treeherder | mozilla-beta@bfdb6e623a36 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | roc |
bugs | 617539 |
milestone | 2.2a1pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/content/html/content/src/nsTextEditorState.cpp +++ b/content/html/content/src/nsTextEditorState.cpp @@ -892,20 +892,18 @@ nsTextInputListener::EditAction() // no undo items; JS could change the value and we'd still need to save it) frame->SetValueChanged(PR_TRUE); if (!mSettingValue) { mTxtCtrlElement->OnValueChanged(PR_TRUE); } // 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 // we are not uisng it in this function any more. return NS_OK; }
--- a/editor/idl/nsIEditor.idl +++ b/editor/idl/nsIEditor.idl @@ -50,17 +50,17 @@ interface nsIDocumentStateListener; interface nsIOutputStream; interface nsITransactionManager; interface nsITransaction; interface nsIEditorObserver; interface nsIEditActionListener; interface nsIInlineSpellChecker; interface nsITransferable; -[scriptable, uuid(78b0bde0-ab69-428b-ab30-fcc09eead499)] +[scriptable, uuid(bd5d93f0-6451-11e0-ae3e-0800200c9a66)] interface nsIEditor : nsISupports { %{C++ typedef short EDirection; %} const short eNone = 0; const short eNext = 1; @@ -567,20 +567,16 @@ interface nsIEditor : nsISupports /** Dumps a text representation of the content tree to standard out */ void debugDumpContent() ; /* Run unit tests. Noop in optimized builds */ void debugUnitTests(out long outNumTests, out long outNumTestsFailed); /* 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 * are being called, and will throw upon access at all other times. */ readonly attribute boolean lastKeypressEventTrusted; };
--- a/editor/libeditor/base/nsEditor.cpp +++ b/editor/libeditor/base/nsEditor.cpp @@ -200,17 +200,16 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN( NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mActionListeners) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mEditorObservers) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mDocStateListeners) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mEventTarget) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mEventListener) 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) NS_INTERFACE_MAP_ENTRY(nsIEditor) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIEditor) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF(nsEditor)
--- a/editor/libeditor/base/nsEditor.h +++ b/editor/libeditor/base/nsEditor.h @@ -95,18 +95,17 @@ class nsIDOMNSEvent; /** implementation of an editor object. it will be the controller/focal point * for the main editor services. i.e. the GUIManager, publishing, transaction * manager, event interfaces. the idea for the event interfaces is to have them * delegate the actual commands to the editor independent of the XPFE implementation. */ class nsEditor : public nsIEditor, public nsIEditorIMESupport, public nsSupportsWeakReference, - public nsIPhonetic, - public nsIEditor_MOZILLA_2_0_BRANCH + public nsIPhonetic { public: enum IterDirection { kIterForward, kIterBackward }; @@ -152,19 +151,16 @@ public: /* ------------ nsIEditor methods -------------- */ NS_DECL_NSIEDITOR /* ------------ nsIEditorIMESupport methods -------------- */ NS_DECL_NSIEDITORIMESUPPORT // nsIPhonetic NS_DECL_NSIPHONETIC - // nsIEditor_MOZILLA_2_0_BRANCH - NS_DECL_NSIEDITOR_MOZILLA_2_0_BRANCH - public: NS_IMETHOD InsertTextImpl(const nsAString& aStringToInsert, nsCOMPtr<nsIDOMNode> *aInOutNode, PRInt32 *aInOutOffset, nsIDOMDocument *aDoc); nsresult InsertTextIntoTextNodeImpl(const nsAString& aStringToInsert,