Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset ce25d866bd65 (bug 1343760) for causing bug 1351328.

Browse Source 
--HG--
extra : rebase_source : 6c5b3c981c1919f8f1134f63a03c77b920112c6c
This commit is contained in:
Ryan VanderMeulen 2017-03-28 12:50:14 -04:00
parent be248812bc
commit 89d7c65bcf
3 changed files with 8 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/events/DataTransferItem.cpp
View File

@ -463,18 +463,10 @@ DataTransferItem::GetAsString(FunctionStringCallback* aCallback,
nsString mStringData;
};
nsCOMPtr<nsINode> parentNode =
do_QueryInterface(mDataTransfer->GetParentObject());
MOZ_ASSERT(parentNode);
RefPtr<GASRunnable> runnable = new GASRunnable(aCallback, stringData);
if (nsIDocument* doc = parentNode->OwnerDoc()) {
rv = doc->Dispatch("GASRunnable", TaskCategory::Other,
runnable.forget());
} else {
rv = NS_DispatchToMainThread(runnable);
}
rv = NS_DispatchToMainThread(runnable);
if (NS_FAILED(rv)) {
NS_WARNING("Dispatch to main thread Failed in "
NS_WARNING("NS_DispatchToMainThread Failed in "
"DataTransferItem::GetAsString!");
}
}

13
dom/events/EventListenerService.cpp
View File

@ -366,17 +366,8 @@ EventListenerService::NotifyAboutMainThreadListenerChangeInternal(dom::EventTarg
if (!mPendingListenerChanges) {
mPendingListenerChanges = nsArrayBase::Create();
nsCOMPtr<nsIRunnable> runnable =
NewRunnableMethod("EventListenerService::NotifyPendingChanges",
this, &EventListenerService::NotifyPendingChanges);
if (nsCOMPtr<nsIGlobalObject> global = aTarget->GetOwnerGlobal()) {
global->Dispatch(nullptr, TaskCategory::Other, runnable.forget());
} else if (nsCOMPtr<nsINode> node = do_QueryInterface(aTarget)) {
node->OwnerDoc()->Dispatch(nullptr, TaskCategory::Other,
runnable.forget());
} else {
NS_DispatchToCurrentThread(runnable);
}
NS_DispatchToCurrentThread(NewRunnableMethod(this,
&EventListenerService::NotifyPendingChanges));
}
RefPtr<EventListenerChange> changes = mPendingListenerChangesSet.Get(aTarget);

36
dom/events/IMEContentObserver.cpp
View File

@ -1414,16 +1414,8 @@ IMEContentObserver::FlushMergeableNotifications()
// it may kick runnable event immediately after DOM tree is changed but
// the selection range isn't modified yet.
mQueuedSender = new IMENotificationSender(this);
nsIScriptGlobalObject* globalObject = mDocShell ?
mDocShell->GetScriptGlobalObject() :
nullptr;
if (globalObject) {
RefPtr<IMENotificationSender> queuedSender = mQueuedSender;
globalObject->Dispatch("IMENotificationSender",
TaskCategory::Other, queuedSender.forget());
} else {
NS_DispatchToCurrentThread(mQueuedSender);
}
NS_DispatchToCurrentThread(mQueuedSender);
MOZ_LOG(sIMECOLog, LogLevel::Debug,
("0x%p IMEContentObserver::FlushMergeableNotifications(), "
"finished", this));
@ -1548,17 +1540,7 @@ IMEContentObserver::IMENotificationSender::Run()
"posting IMENotificationSender to current thread", this));
mIMEContentObserver->mQueuedSender =
new IMENotificationSender(mIMEContentObserver);
nsIScriptGlobalObject* globalObject =
mIMEContentObserver->mDocShell ?
mIMEContentObserver->mDocShell->GetScriptGlobalObject() : nullptr;
if (globalObject) {
RefPtr<IMENotificationSender> queuedSender =
mIMEContentObserver->mQueuedSender;
globalObject->Dispatch("IMENotificationSender",
TaskCategory::Other, queuedSender.forget());
} else {
NS_DispatchToCurrentThread(mIMEContentObserver->mQueuedSender);
}
NS_DispatchToCurrentThread(mIMEContentObserver->mQueuedSender);
return NS_OK;
}
// This is the first notification to IME. So, we don't need to notify
@ -1622,17 +1604,7 @@ IMEContentObserver::IMENotificationSender::Run()
"posting IMENotificationSender to current thread", this));
mIMEContentObserver->mQueuedSender =
new IMENotificationSender(mIMEContentObserver);
nsIScriptGlobalObject* globalObject =
mIMEContentObserver->mDocShell ?
mIMEContentObserver->mDocShell->GetScriptGlobalObject() : nullptr;
if (globalObject) {
RefPtr<IMENotificationSender> queuedSender =
mIMEContentObserver->mQueuedSender;
globalObject->Dispatch("IMENotificationSender",
TaskCategory::Other, queuedSender.forget());
} else {
NS_DispatchToCurrentThread(mIMEContentObserver->mQueuedSender);
}
NS_DispatchToCurrentThread(mIMEContentObserver->mQueuedSender);
}
}
return NS_OK;