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 895274 part.192 Rename NS_COMPOSITION_UPDATE to eCompositionUpdate r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2015-09-11 21:21:27 +09:00
parent 55f7afc2de
commit 8df35db954
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/events/EventNameList.h
View File

@ -680,7 +680,7 @@ NON_IDL_EVENT(compositionstart,
EventNameType_XUL,
eCompositionEventClass)
NON_IDL_EVENT(compositionupdate,
NS_COMPOSITION_UPDATE,
eCompositionUpdate,
EventNameType_XUL,
eCompositionEventClass)
NON_IDL_EVENT(compositionend,

6
dom/events/IMEStateManager.cpp
View File

@ -141,8 +141,8 @@ GetEventMessageName(EventMessage aMessage)
return "eCompositionStart";
case eCompositionEnd:
return "eCompositionEnd";
case NS_COMPOSITION_UPDATE:
return "NS_COMPOSITION_UPDATE";
case eCompositionUpdate:
return "eCompositionUpdate";
case NS_COMPOSITION_CHANGE:
return "NS_COMPOSITION_CHANGE";
case eCompositionCommitAsIs:
@ -1147,7 +1147,7 @@ IMEStateManager::DispatchCompositionEvent(
return;
}
MOZ_ASSERT(aCompositionEvent->mMessage != NS_COMPOSITION_UPDATE,
MOZ_ASSERT(aCompositionEvent->mMessage != eCompositionUpdate,
"compositionupdate event shouldn't be dispatched manually");
EnsureTextCompositionArray();

4
dom/events/TextComposition.cpp
View File

@ -93,7 +93,7 @@ TextComposition::MaybeDispatchCompositionUpdate(
if (mLastData == aCompositionEvent->mData) {
return true;
}
CloneAndDispatchAs(aCompositionEvent, NS_COMPOSITION_UPDATE);
CloneAndDispatchAs(aCompositionEvent, eCompositionUpdate);
return IsValidStateForComposition(aCompositionEvent->widget);
}
@ -120,7 +120,7 @@ TextComposition::CloneAndDispatchAs(
nsEventStatus dummyStatus = nsEventStatus_eConsumeNoDefault;
nsEventStatus* status = aStatus ? aStatus : &dummyStatus;
if (aMessage == NS_COMPOSITION_UPDATE) {
if (aMessage == eCompositionUpdate) {
mLastData = compositionEvent.mData;
}
EventDispatcher::Dispatch(mNode, mPresContext,

2
editor/libeditor/nsEditor.cpp
View File

@ -5161,7 +5161,7 @@ nsEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent)
return false;
case eCompositionStart:
case eCompositionEnd:
case NS_COMPOSITION_UPDATE:
case eCompositionUpdate:
case NS_COMPOSITION_CHANGE:
case eCompositionCommitAsIs:
// Don't allow composition events whose internal event are not

4
widget/ContentCache.cpp
View File

@ -31,8 +31,8 @@ GetEventMessageName(EventMessage aMessage)
return "eCompositionStart";
case eCompositionEnd:
return "eCompositionEnd";
case NS_COMPOSITION_UPDATE:
return "NS_COMPOSITION_UPDATE";
case eCompositionUpdate:
return "eCompositionUpdate";
case NS_COMPOSITION_CHANGE:
return "NS_COMPOSITION_CHANGE";
case eCompositionCommitAsIs:

4
widget/EventMessageList.h
View File

@ -151,11 +151,11 @@ NS_EVENT_MESSAGE(eCompositionStart, eCompositionEventFirst)
// This event should NOT be dispatched from widget if NS_COMPOSITION_COMMIT
// is available.
NS_EVENT_MESSAGE(eCompositionEnd, eCompositionEventFirst + 1)
// NS_COMPOSITION_UPDATE is the message for DOM compositionupdate event.
// eCompositionUpdate is the message for DOM compositionupdate event.
// This event should NOT be dispatched from widget since it will be dispatched
// by mozilla::TextComposition automatically if NS_COMPOSITION_CHANGE event
// will change composition string.
NS_EVENT_MESSAGE(NS_COMPOSITION_UPDATE, eCompositionEventFirst + 2)
NS_EVENT_MESSAGE(eCompositionUpdate, eCompositionEventFirst + 2)
// NS_COMPOSITION_CHANGE is the message for representing a change of
// composition string. This should be dispatched from widget even if
// composition string isn't changed but the ranges are changed. This causes

2
widget/WidgetEventImpl.cpp
View File

@ -138,7 +138,7 @@ WidgetEvent::HasIMEEventMessage() const
switch (mMessage) {
case eCompositionStart:
case eCompositionEnd:
case NS_COMPOSITION_UPDATE:
case eCompositionUpdate:
case NS_COMPOSITION_CHANGE:
case eCompositionCommitAsIs:
case NS_COMPOSITION_COMMIT: