wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1059705 - revert the change which made nsIEditor builtinclass, r=masayuki

Browse Source
This commit is contained in:
Olli Pettay 2014-08-28 17:33:35 +03:00
parent c9e5585926
commit dc7e48aa78
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1521,8 +1521,10 @@ nsTextEditorState::UnbindFromFrame(nsTextControlFrame* aFrame)
// If the editor is modified but nsIEditorObserver::EditAction() hasn't been
// called yet, we need to notify it here because editor may be destroyed
// before EditAction() is called if selection listener causes flushing layout.
bool isInEditAction = false;
if (mTextListener && mEditor && mEditorInitialized &&
mEditor->GetIsInEditAction()) {
NS_SUCCEEDED(mEditor->GetIsInEditAction(&isInEditAction)) &&
isInEditAction) {
mTextListener->EditAction();
}

4
dom/events/IMEContentObserver.cpp
View File

@ -991,7 +991,9 @@ IMEContentObserver::FlushMergeableNotifications()
}
// If we're in handling an edit action, this method will be called later.
if (mEditor && mEditor->GetIsInEditAction()) {
bool isInEditAction = false;
if (mEditor && NS_SUCCEEDED(mEditor->GetIsInEditAction(&isInEditAction)) &&
isInEditAction) {
return;
}

4
editor/nsIEditor.idl
View File

@ -21,7 +21,7 @@ interface nsIEditActionListener;
interface nsIInlineSpellChecker;
interface nsITransferable;
[builtinclass, scriptable, uuid(c3b61bc9-ccdd-4bcd-acd8-1b8dcbe6a247)]
[scriptable, uuid(04714a01-e02f-4ef5-a388-612451d0db16)]
interface nsIEditor : nsISupports
{
@ -555,5 +555,5 @@ interface nsIEditor : nsISupports
* nsIEditorObserver::BeforeEditAction() and nsIEditorObserver::EditAction()
* or nsIEditorObserver::CancelEditAction(). Otherwise, false.
*/
[infallible, noscript] readonly attribute boolean isInEditAction;
[noscript] readonly attribute boolean isInEditAction;
};

2
editor/nsIHTMLEditor.idl
View File

@ -22,7 +22,7 @@ class Element;
[ptr] native Element (mozilla::dom::Element);
[builtinclass, scriptable, uuid(9470bee7-cad3-4382-8fb4-6bdda9f0273a)]
[scriptable, uuid(393a364f-e8e2-48a1-a271-a0067b6bac9b)]
interface nsIHTMLEditor : nsISupports
{

2
editor/nsIPlaintextEditor.idl
View File

@ -5,7 +5,7 @@
#include "nsISupports.idl"
[builtinclass, scriptable, uuid(da8f244b-6ffc-4be1-8b1a-667abfe1d304)]
[scriptable, uuid(b74fb158-1265-4102-91eb-edd0136b49f8)]
interface nsIPlaintextEditor : nsISupports
{