Bug 895274 part.1 Rename WidgetEvent::message to WidgetEvent::mMessage r=smaug
This commit is contained in:
@@ -515,11 +515,11 @@ ContentCacheInParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent,
|
||||
aEvent.mSucceeded = false;
|
||||
aEvent.mReply.mFocusedWidget = aWidget;
|
||||
|
||||
switch (aEvent.message) {
|
||||
switch (aEvent.mMessage) {
|
||||
case NS_QUERY_SELECTED_TEXT:
|
||||
MOZ_LOG(sContentCacheLog, LogLevel::Info,
|
||||
("ContentCacheInParent: 0x%p HandleQueryContentEvent("
|
||||
"aEvent={ message=NS_QUERY_SELECTED_TEXT }, aWidget=0x%p)",
|
||||
"aEvent={ mMessage=NS_QUERY_SELECTED_TEXT }, aWidget=0x%p)",
|
||||
this, aWidget));
|
||||
if (NS_WARN_IF(!IsSelectionValid())) {
|
||||
// If content cache hasn't been initialized properly, make the query
|
||||
@@ -560,7 +560,7 @@ ContentCacheInParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent,
|
||||
case NS_QUERY_TEXT_CONTENT: {
|
||||
MOZ_LOG(sContentCacheLog, LogLevel::Info,
|
||||
("ContentCacheInParent: 0x%p HandleQueryContentEvent("
|
||||
"aEvent={ message=NS_QUERY_TEXT_CONTENT, mInput={ mOffset=%u, "
|
||||
"aEvent={ mMessage=NS_QUERY_TEXT_CONTENT, mInput={ mOffset=%u, "
|
||||
"mLength=%u } }, aWidget=0x%p), mText.Length()=%u",
|
||||
this, aEvent.mInput.mOffset,
|
||||
aEvent.mInput.mLength, aWidget, mText.Length()));
|
||||
@@ -586,7 +586,7 @@ ContentCacheInParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent,
|
||||
case NS_QUERY_TEXT_RECT:
|
||||
MOZ_LOG(sContentCacheLog, LogLevel::Info,
|
||||
("ContentCacheInParent: 0x%p HandleQueryContentEvent("
|
||||
"aEvent={ message=NS_QUERY_TEXT_RECT, mInput={ mOffset=%u, "
|
||||
"aEvent={ mMessage=NS_QUERY_TEXT_RECT, mInput={ mOffset=%u, "
|
||||
"mLength=%u } }, aWidget=0x%p), mText.Length()=%u",
|
||||
this, aEvent.mInput.mOffset, aEvent.mInput.mLength, aWidget,
|
||||
mText.Length()));
|
||||
@@ -641,7 +641,7 @@ ContentCacheInParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent,
|
||||
case NS_QUERY_CARET_RECT:
|
||||
MOZ_LOG(sContentCacheLog, LogLevel::Info,
|
||||
("ContentCacheInParent: 0x%p HandleQueryContentEvent("
|
||||
"aEvent={ message=NS_QUERY_CARET_RECT, mInput={ mOffset=%u } }, "
|
||||
"aEvent={ mMessage=NS_QUERY_CARET_RECT, mInput={ mOffset=%u } }, "
|
||||
"aWidget=0x%p), mText.Length()=%u",
|
||||
this, aEvent.mInput.mOffset, aWidget, mText.Length()));
|
||||
if (NS_WARN_IF(!IsSelectionValid())) {
|
||||
@@ -668,7 +668,7 @@ ContentCacheInParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent,
|
||||
case NS_QUERY_EDITOR_RECT:
|
||||
MOZ_LOG(sContentCacheLog, LogLevel::Info,
|
||||
("ContentCacheInParent: 0x%p HandleQueryContentEvent("
|
||||
"aEvent={ message=NS_QUERY_EDITOR_RECT }, aWidget=0x%p)",
|
||||
"aEvent={ mMessage=NS_QUERY_EDITOR_RECT }, aWidget=0x%p)",
|
||||
this, aWidget));
|
||||
aEvent.mReply.mRect = mEditorRect;
|
||||
MOZ_LOG(sContentCacheLog, LogLevel::Info,
|
||||
@@ -846,17 +846,17 @@ ContentCacheInParent::OnCompositionEvent(const WidgetCompositionEvent& aEvent)
|
||||
{
|
||||
MOZ_LOG(sContentCacheLog, LogLevel::Info,
|
||||
("ContentCacheInParent: 0x%p OnCompositionEvent(aEvent={ "
|
||||
"message=%s, mData=\"%s\" (Length()=%u), mRanges->Length()=%u }), "
|
||||
"mMessage=%s, mData=\"%s\" (Length()=%u), mRanges->Length()=%u }), "
|
||||
"mPendingEventsNeedingAck=%u, mIsComposing=%s, "
|
||||
"mRequestedToCommitOrCancelComposition=%s",
|
||||
this, GetEventMessageName(aEvent.message),
|
||||
this, GetEventMessageName(aEvent.mMessage),
|
||||
NS_ConvertUTF16toUTF8(aEvent.mData).get(), aEvent.mData.Length(),
|
||||
aEvent.mRanges ? aEvent.mRanges->Length() : 0, mPendingEventsNeedingAck,
|
||||
GetBoolName(mIsComposing),
|
||||
GetBoolName(mRequestedToCommitOrCancelComposition)));
|
||||
|
||||
if (!aEvent.CausesDOMTextEvent()) {
|
||||
MOZ_ASSERT(aEvent.message == NS_COMPOSITION_START);
|
||||
MOZ_ASSERT(aEvent.mMessage == NS_COMPOSITION_START);
|
||||
mIsComposing = !aEvent.CausesDOMCompositionEndEvent();
|
||||
mCompositionStart = mSelection.StartOffset();
|
||||
// XXX What's this case??
|
||||
@@ -900,10 +900,10 @@ ContentCacheInParent::OnSelectionEvent(
|
||||
{
|
||||
MOZ_LOG(sContentCacheLog, LogLevel::Info,
|
||||
("ContentCacheInParent: 0x%p OnSelectionEvent(aEvent={ "
|
||||
"message=%s, mOffset=%u, mLength=%u, mReversed=%s, "
|
||||
"mMessage=%s, mOffset=%u, mLength=%u, mReversed=%s, "
|
||||
"mExpandToClusterBoundary=%s, mUseNativeLineBreak=%s }), "
|
||||
"mPendingEventsNeedingAck=%u, mIsComposing=%s",
|
||||
this, GetEventMessageName(aSelectionEvent.message),
|
||||
this, GetEventMessageName(aSelectionEvent.mMessage),
|
||||
aSelectionEvent.mOffset, aSelectionEvent.mLength,
|
||||
GetBoolName(aSelectionEvent.mReversed),
|
||||
GetBoolName(aSelectionEvent.mExpandToClusterBoundary),
|
||||
|
||||
Reference in New Issue
Block a user