corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions 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 62528b4168
commit b87dc53d61
7 changed files with 12 additions and 12 deletions
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, EventNameType_XUL,
eCompositionEventClass) eCompositionEventClass)
NON_IDL_EVENT(compositionupdate, NON_IDL_EVENT(compositionupdate,
NS_COMPOSITION_UPDATE, eCompositionUpdate,
EventNameType_XUL, EventNameType_XUL,
eCompositionEventClass) eCompositionEventClass)
NON_IDL_EVENT(compositionend, NON_IDL_EVENT(compositionend,

6
dom/events/IMEStateManager.cpp
View File

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

4
dom/events/TextComposition.cpp
View File

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

2
editor/libeditor/nsEditor.cpp
View File

@@ -5161,7 +5161,7 @@ nsEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent)
return false; return false;
case eCompositionStart: case eCompositionStart:
case eCompositionEnd: case eCompositionEnd:
case NS_COMPOSITION_UPDATE: case eCompositionUpdate:
case NS_COMPOSITION_CHANGE: case NS_COMPOSITION_CHANGE:
case eCompositionCommitAsIs: case eCompositionCommitAsIs:
// Don't allow composition events whose internal event are not // 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"; return "eCompositionStart";
case eCompositionEnd: case eCompositionEnd:
return "eCompositionEnd"; return "eCompositionEnd";
case NS_COMPOSITION_UPDATE: case eCompositionUpdate:
return "NS_COMPOSITION_UPDATE"; return "eCompositionUpdate";
case NS_COMPOSITION_CHANGE: case NS_COMPOSITION_CHANGE:
return "NS_COMPOSITION_CHANGE"; return "NS_COMPOSITION_CHANGE";
case eCompositionCommitAsIs: 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 // This event should NOT be dispatched from widget if NS_COMPOSITION_COMMIT
// is available. // is available.
NS_EVENT_MESSAGE(eCompositionEnd, eCompositionEventFirst + 1) 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 // This event should NOT be dispatched from widget since it will be dispatched
// by mozilla::TextComposition automatically if NS_COMPOSITION_CHANGE event // by mozilla::TextComposition automatically if NS_COMPOSITION_CHANGE event
// will change composition string. // 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 // NS_COMPOSITION_CHANGE is the message for representing a change of
// composition string. This should be dispatched from widget even if // composition string. This should be dispatched from widget even if
// composition string isn't changed but the ranges are changed. This causes // 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) { switch (mMessage) {
case eCompositionStart: case eCompositionStart:
case eCompositionEnd: case eCompositionEnd:
case NS_COMPOSITION_UPDATE: case eCompositionUpdate:
case NS_COMPOSITION_CHANGE: case NS_COMPOSITION_CHANGE:
case eCompositionCommitAsIs: case eCompositionCommitAsIs:
case NS_COMPOSITION_COMMIT: case NS_COMPOSITION_COMMIT: