Bug 1224994 part.13 Fix some comments which say "locked content" in TSFTextStore.cpp r?m_kato
MozReview-Commit-ID: Jze8WtPx82G
--- a/widget/windows/TSFTextStore.cpp
+++ b/widget/windows/TSFTextStore.cpp
@@ -1604,17 +1604,17 @@ TSFTextStore::DispatchEvent(WidgetGUIEve
}
mWidget->DispatchWindowEvent(&aEvent);
}
void
TSFTextStore::FlushPendingActions()
{
if (!mWidget || mWidget->Destroyed()) {
- // Note that don't clear the locked contents because TIP may try to commit
+ // Note that don't clear mContentForTSF because TIP may try to commit
// composition with a document lock. In such case, TSFTextStore needs to
// behave as expected by TIP.
mPendingActions.Clear();
mPendingSelectionChangeData.Clear();
mHasReturnedNoLayoutError = false;
return;
}
@@ -1658,17 +1658,17 @@ TSFTextStore::FlushPendingActions()
("TSF: 0x%p TSFTextStore::FlushPendingActions() "
"FAILED due to eSetSelection failure", this));
break;
}
}
// eCompositionStart always causes
// NOTIFY_IME_OF_COMPOSITION_EVENT_HANDLED. Therefore, we should
- // wait to clear the locked content until it's notified.
+ // wait to clear mContentForTSF until it's notified.
mDeferClearingContentForTSF = true;
MOZ_LOG(sTextStoreLog, LogLevel::Debug,
("TSF: 0x%p TSFTextStore::FlushPendingActions() "
"dispatching compositionstart event...", this));
WidgetEventTime eventTime = mWidget->CurrentMessageWidgetEventTime();
nsEventStatus status;
rv = mDispatcher->StartComposition(status, &eventTime);
@@ -1690,17 +1690,17 @@ TSFTextStore::FlushPendingActions()
("TSF: 0x%p TSFTextStore::FlushPendingActions() "
"flushing COMPOSITION_UPDATE={ mData=\"%s\", "
"mRanges=0x%p, mRanges->Length()=%d }",
this, NS_ConvertUTF16toUTF8(action.mData).get(), action.mRanges.get(),
action.mRanges ? action.mRanges->Length() : 0));
// eCompositionChange causes a DOM text event, the IME will be notified
// of NOTIFY_IME_OF_COMPOSITION_EVENT_HANDLED. In this case, we
- // should not clear the locked content until we notify the IME of the
+ // should not clear mContentForTSF until we notify the IME of the
// composition update.
mDeferClearingContentForTSF = true;
rv = mDispatcher->SetPendingComposition(action.mData,
action.mRanges);
if (NS_WARN_IF(NS_FAILED(rv))) {
MOZ_LOG(sTextStoreLog, LogLevel::Error,
("TSF: 0x%p TSFTextStore::FlushPendingActions() "
@@ -1730,17 +1730,17 @@ TSFTextStore::FlushPendingActions()
case PendingAction::COMPOSITION_END: {
MOZ_LOG(sTextStoreLog, LogLevel::Debug,
("TSF: 0x%p TSFTextStore::FlushPendingActions() "
"flushing COMPOSITION_END={ mData=\"%s\" }",
this, NS_ConvertUTF16toUTF8(action.mData).get()));
// Dispatching eCompositionCommit causes a DOM text event, then,
// the IME will be notified of NOTIFY_IME_OF_COMPOSITION_EVENT_HANDLED.
- // In this case, we should not clear the locked content until we notify
+ // In this case, we should not clear mContentForTSFuntil we notify
// the IME of the composition update.
mDeferClearingContentForTSF = true;
MOZ_LOG(sTextStoreLog, LogLevel::Debug,
("TSF: 0x%p TSFTextStore::FlushPendingActions(), "
"dispatching compositioncommit event...", this));
WidgetEventTime eventTime = mWidget->CurrentMessageWidgetEventTime();
nsEventStatus status;