Skip to content

Commit

Permalink
Bug 1432528 - part 4: Remove nsIEditorObserver::BeforeEditAction() an…
Browse files Browse the repository at this point in the history
…d nsIEditorObserver::CancelEditAction() because nobody implements them r=m_kato

Now, nobody implements nsIEditorObserver::BeforeEditAction() and
nsIEditorObserver::CancelEditAction().  So, we can remove them.

MozReview-Commit-ID: DYppLayC5oT
  • Loading branch information
masayuki-nakano committed Jan 24, 2018
1 parent 6d67658 commit 1457944
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 38 deletions.
16 changes: 0 additions & 16 deletions editor/libeditor/EditorBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2207,14 +2207,6 @@ EditorBase::NotifyEditorObservers(NotificationForEditorObservers aNotification)
RefPtr<IMEContentObserver> observer = mIMEContentObserver;
observer->BeforeEditAction();
}

if (!mEditorObservers.IsEmpty()) {
// Copy the observers since EditAction()s can modify mEditorObservers.
AutoEditorObserverArray observers(mEditorObservers);
for (auto& observer : observers) {
observer->BeforeEditAction();
}
}
break;
case eNotifyEditorObserversOfCancel:
mIsInEditAction = false;
Expand All @@ -2223,14 +2215,6 @@ EditorBase::NotifyEditorObservers(NotificationForEditorObservers aNotification)
RefPtr<IMEContentObserver> observer = mIMEContentObserver;
observer->CancelEditAction();
}

if (!mEditorObservers.IsEmpty()) {
// Copy the observers since EditAction()s can modify mEditorObservers.
AutoEditorObserverArray observers(mEditorObservers);
for (auto& observer : observers) {
observer->CancelEditAction();
}
}
break;
default:
MOZ_CRASH("Handle all notifications here");
Expand Down
30 changes: 8 additions & 22 deletions editor/nsIEditorObserver.idl
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,18 @@

#include "nsISupports.idl"

/*
Editor Observer interface to outside world
*/

[scriptable, uuid(f3ee57a6-890c-4ce0-a584-8a84bba0292e)]

/**
* A generic editor observer interface.
* <P>
* nsIEditorObserver is the interface used by applications wishing to be notified
* when the editor has completed a user action.
*
* nsIEditorObserver is the interface used by applications wishing to be
* notified when the editor has completed a user action.
* Note that when you want to use this from C++, please check if EditorBase
* can treat your class directly since using this interface may make editor
* slower.
*/
interface nsIEditorObserver : nsISupports {
[scriptable, uuid(f3ee57a6-890c-4ce0-a584-8a84bba0292e)]
interface nsIEditorObserver : nsISupports
{
/**
* Called after the editor completes a user action.
*/
void EditAction();
/**
* Called when editor starts to handle a user action. I.e., This must be
* called before the first DOM change.
*/
void BeforeEditAction();
/**
* Called after BeforeEditAction() is called but EditorAction() won't be
* called.
*/
void CancelEditAction();
};

0 comments on commit 1457944

Please sign in to comment.