Bug 1179695 - Remove mWasAsync from WidgetQueryContentEvent. r=masayuki,nchen

This commit is contained in:
Makoto Kato 2015-07-09 15:09:56 +09:00
parent 7e8beb711d
commit e7d7a10538
4 changed files with 2 additions and 6 deletions

View File

@ -510,7 +510,6 @@ ContentCacheInParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent,
MOZ_ASSERT(aWidget);
aEvent.mSucceeded = false;
aEvent.mWasAsync = false;
aEvent.mReply.mFocusedWidget = aWidget;
switch (aEvent.message) {

View File

@ -464,7 +464,6 @@ public:
nsIWidget* aWidget)
: WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eQueryContentEventClass)
, mSucceeded(false)
, mWasAsync(false)
, mUseNativeLineBreak(true)
, mWithFontRanges(false)
{
@ -546,7 +545,6 @@ public:
}
bool mSucceeded;
bool mWasAsync;
bool mUseNativeLineBreak;
bool mWithFontRanges;
struct

View File

@ -1895,7 +1895,7 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
this);
InitEvent(event, nullptr);
DispatchEvent(&event);
MOZ_ASSERT(event.mSucceeded && !event.mWasAsync);
MOZ_ASSERT(event.mSucceeded);
if (start < 0)
start = int32_t(event.GetSelectionStart());
@ -1978,7 +1978,7 @@ nsWindow::OnIMEEvent(AndroidGeckoEvent *ae)
this);
InitEvent(queryEvent, nullptr);
DispatchEvent(&queryEvent);
MOZ_ASSERT(queryEvent.mSucceeded && !queryEvent.mWasAsync);
MOZ_ASSERT(queryEvent.mSucceeded);
event.mData = queryEvent.mReply.mString;
}

View File

@ -597,7 +597,6 @@ struct ParamTraits<mozilla::WidgetQueryContentEvent>
static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
{
aResult->mWasAsync = true;
return ReadParam(aMsg, aIter,
static_cast<mozilla::WidgetGUIEvent*>(aResult)) &&
ReadParam(aMsg, aIter, &aResult->mSucceeded) &&