Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1176954 part.8 ContentCacheInParent::OnEventNeedingAckReceived() should log the event message r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2015-07-11 10:53:56 +09:00
parent 09355c0e38
commit 500bdf163d
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/ipc/PBrowser.ipdl
View File

@ -269,8 +269,10 @@ parent:
* OnEventNeedingAckReceived() is called when a child process dispatches a
* composition event or a selection event which is sent from the parent
* process.
*
* message The message value of the received event.
*/
prio(urgent) async OnEventNeedingAckReceived();
prio(urgent) async OnEventNeedingAckReceived(uint32_t message);
/**
* Tells chrome to start plugin IME. If this results in a string getting

4
dom/ipc/TabChild.cpp
View File

@ -2659,7 +2659,7 @@ TabChild::RecvKeyEvent(const nsString& aType,
bool
TabChild::RecvCompositionEvent(const WidgetCompositionEvent& event)
{
unused << SendOnEventNeedingAckReceived();
unused << SendOnEventNeedingAckReceived(event.message);
WidgetCompositionEvent localEvent(event);
localEvent.widget = mPuppetWidget;
APZCCallbackHelper::DispatchWidgetEvent(localEvent);
@ -2669,7 +2669,7 @@ TabChild::RecvCompositionEvent(const WidgetCompositionEvent& event)
bool
TabChild::RecvSelectionEvent(const WidgetSelectionEvent& event)
{
unused << SendOnEventNeedingAckReceived();
unused << SendOnEventNeedingAckReceived(event.message);
WidgetSelectionEvent localEvent(event);
localEvent.widget = mPuppetWidget;
APZCCallbackHelper::DispatchWidgetEvent(localEvent);

4
dom/ipc/TabParent.cpp
View File

@ -2086,7 +2086,7 @@ TabParent::RecvNotifyIMEPositionChange(const ContentCache& aContentCache)
}
bool
TabParent::RecvOnEventNeedingAckReceived()
TabParent::RecvOnEventNeedingAckReceived(const uint32_t& aMessage)
{
// This is called when the child process receives WidgetCompositionEvent or
// WidgetSelectionEvent.
@ -2098,7 +2098,7 @@ TabParent::RecvOnEventNeedingAckReceived()
// While calling OnEventNeedingAckReceived(), TabParent *might* be destroyed
// since it may send notifications to IME.
nsRefPtr<TabParent> kungFuDeathGrip(this);
mContentCache.OnEventNeedingAckReceived(widget);
mContentCache.OnEventNeedingAckReceived(widget, aMessage);
return true;
}

2
dom/ipc/TabParent.h
View File

@ -177,7 +177,7 @@ public:
virtual bool RecvNotifyIMEMouseButtonEvent(const widget::IMENotification& aEventMessage,
bool* aConsumedByIME) override;
virtual bool RecvNotifyIMEPositionChange(const ContentCache& aContentCache) override;
virtual bool RecvOnEventNeedingAckReceived() override;
virtual bool RecvOnEventNeedingAckReceived(const uint32_t& aMessage) override;
virtual bool RecvEndIMEComposition(const bool& aCancel,
bool* aNoCompositionEvent,
nsString* aComposition) override;

9
widget/ContentCache.cpp
View File

@ -914,15 +914,16 @@ ContentCacheInParent::OnSelectionEvent(
}
void
ContentCacheInParent::OnEventNeedingAckReceived(nsIWidget* aWidget)
ContentCacheInParent::OnEventNeedingAckReceived(nsIWidget* aWidget,
uint32_t aMessage)
{
// This is called when the child process receives WidgetCompositionEvent or
// WidgetSelectionEvent.
MOZ_LOG(sContentCacheLog, LogLevel::Info,
("ContentCacheInParent: 0x%p OnEventNeedingAckReceived(aWidget=0x%p), "
"mPendingEventsNeedingAck=%u",
this, aWidget, mPendingEventsNeedingAck));
("ContentCacheInParent: 0x%p OnEventNeedingAckReceived(aWidget=0x%p, "
"aMessage=%s), mPendingEventsNeedingAck=%u",
this, aWidget, GetEventMessageName(aMessage), mPendingEventsNeedingAck));
MOZ_RELEASE_ASSERT(mPendingEventsNeedingAck > 0);
if (--mPendingEventsNeedingAck) {

2
widget/ContentCache.h
View File

@ -322,7 +322,7 @@ public:
* TabParent or aWidget. Therefore, the caller must not destroy
* this instance during a call of this method.
*/
void OnEventNeedingAckReceived(nsIWidget* aWidget);
void OnEventNeedingAckReceived(nsIWidget* aWidget, uint32_t aMessage);
/**
* RequestToCommitComposition() requests to commit or cancel composition to