wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1114554 - Patch 7 - Call BindToOwner on all threads. r=wchen

Browse Source
This commit is contained in:
Nikhil Marathe 2015-06-25 18:50:25 -07:00
parent d99d4d842e
commit c0a2d1d0b6
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dom/notification/Notification.cpp
View File

@ -690,7 +690,8 @@ Notification::IsGetEnabled(JSContext* aCx, JSObject* aObj)
return NS_IsMainThread();
}
Notification::Notification(const nsAString& aID, const nsAString& aTitle, const nsAString& aBody,
Notification::Notification(nsIGlobalObject* aGlobal, const nsAString& aID,
const nsAString& aTitle, const nsAString& aBody,
NotificationDirection aDir, const nsAString& aLang,
const nsAString& aTag, const nsAString& aIconUrl,
const NotificationBehavior& aBehavior)
@ -700,7 +701,14 @@ Notification::Notification(const nsAString& aID, const nsAString& aTitle, const
mTag(aTag), mIconUrl(aIconUrl), mBehavior(aBehavior), mIsClosed(false),
mIsStored(false), mTaskCount(0)
{
if (!NS_IsMainThread()) {
if (NS_IsMainThread()) {
// We can only call this on the main thread because
// Event::SetEventType() called down the call chain when dispatching events
// using DOMEventTargetHelper::DispatchTrustedEvent() will assume the event
// is a main thread event if it has a valid owner. It will then attempt to
// fetch the atom for the event name which asserts main thread only.
BindToOwner(aGlobal);
} else {
mWorkerPrivate = GetCurrentThreadWorkerPrivate();
MOZ_ASSERT(mWorkerPrivate);
}
@ -787,14 +795,8 @@ Notification::ConstructFromFields(
options.mBody = aBody;
options.mTag = aTag;
options.mIcon = aIcon;
nsRefPtr<Notification> notification;
notification = Notification::CreateInternal(aID,
aTitle,
options);
if (NS_IsMainThread()) {
notification->BindToOwner(aGlobal);
}
nsRefPtr<Notification> notification = CreateInternal(aGlobal, aID, aTitle,
options);
notification->InitFromBase64(jsapi.cx(), aData, aRv);
if (NS_WARN_IF(aRv.Failed())) {
@ -879,7 +881,8 @@ Notification::UnpersistNotification()
}
already_AddRefed<Notification>
Notification::CreateInternal(const nsAString& aID,
Notification::CreateInternal(nsIGlobalObject* aGlobal,
const nsAString& aID,
const nsAString& aTitle,
const NotificationOptions& aOptions)
{
@ -900,8 +903,7 @@ Notification::CreateInternal(const nsAString& aID,
id = convertedID;
}
nsRefPtr<Notification> notification = new Notification(id,
aTitle,
nsRefPtr<Notification> notification = new Notification(aGlobal, id, aTitle,
aOptions.mBody,
aOptions.mDir,
aOptions.mLang,
@ -2274,11 +2276,8 @@ Notification::CreateAndShow(nsIGlobalObject* aGlobal,
jsapi.Init(aGlobal);
JSContext* cx = jsapi.cx();
nsRefPtr<Notification> notification = CreateInternal(EmptyString(),
aTitle,
aOptions);
notification->BindToOwner(aGlobal);
nsRefPtr<Notification> notification = CreateInternal(aGlobal, EmptyString(),
aTitle, aOptions);
// Make a structured clone of the aOptions.mData object
JS::Rooted<JS::Value> data(cx, aOptions.mData);

8
dom/notification/Notification.h
View File

@ -289,14 +289,14 @@ public:
bool DispatchClickEvent();
bool DispatchNotificationClickEvent();
protected:
// Callers MUST bind the Notification to the correct DOMEventTargetHelper parent using
// BindToOwner().
Notification(const nsAString& aID, const nsAString& aTitle, const nsAString& aBody,
Notification(nsIGlobalObject* aGlobal, const nsAString& aID,
const nsAString& aTitle, const nsAString& aBody,
NotificationDirection aDir, const nsAString& aLang,
const nsAString& aTag, const nsAString& aIconUrl,
const NotificationBehavior& aBehavior);
static already_AddRefed<Notification> CreateInternal(const nsAString& aID,
static already_AddRefed<Notification> CreateInternal(nsIGlobalObject* aGlobal,
const nsAString& aID,
const nsAString& aTitle,
const NotificationOptions& aOptions);