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 1190478 - Hide PushEvent.data until we ship message encryption. r=mt,jst

Browse Source
This commit is contained in:
Nikhil Marathe 2015-08-03 11:04:41 -07:00
parent b81906a10c
commit cb37e89c41
5 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/push/test/worker.js
View File

@ -6,13 +6,8 @@ this.onpush = handlePush;
function handlePush(event) { function handlePush(event) {
self.clients.matchAll().then(function(result) { self.clients.matchAll().then(function(result) {
if (event instanceof PushEvent && // FIXME(nsm): Bug 1149195 will fix data exposure.
event.data instanceof PushMessageData && if (event instanceof PushEvent && !('data' in event)) {
event.data.text === undefined &&
event.data.json === undefined &&
event.data.arrayBuffer === undefined &&
event.data.blob === undefined) {
result[0].postMessage({type: "finished", okay: "yes"}); result[0].postMessage({type: "finished", okay: "yes"});
return; return;
} }

6
dom/webidl/PushEvent.webidl
View File

@ -11,11 +11,13 @@
Func="nsContentUtils::PushEnabled", Func="nsContentUtils::PushEnabled",
Exposed=ServiceWorker] Exposed=ServiceWorker]
interface PushEvent : ExtendableEvent { interface PushEvent : ExtendableEvent {
readonly attribute PushMessageData data; // FIXME(nsm): Bug 1149195.
// readonly attribute PushMessageData data;
}; };
typedef USVString PushMessageDataInit; typedef USVString PushMessageDataInit;
dictionary PushEventInit : ExtendableEventInit { dictionary PushEventInit : ExtendableEventInit {
PushMessageDataInit data; // FIXME(nsm): Bug 1149195.
// PushMessageDataInit data;
}; };

8
dom/workers/ServiceWorkerEvents.cpp
View File

@ -467,14 +467,6 @@ PushEvent::PushEvent(EventTarget* aOwner)
{ {
} }
NS_IMPL_ADDREF_INHERITED(PushEvent, ExtendableEvent)
NS_IMPL_RELEASE_INHERITED(PushEvent, ExtendableEvent)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(PushEvent)
NS_INTERFACE_MAP_END_INHERITING(ExtendableEvent)
NS_IMPL_CYCLE_COLLECTION_INHERITED(PushEvent, ExtendableEvent, mData)
#endif /* ! MOZ_SIMPLEPUSH */ #endif /* ! MOZ_SIMPLEPUSH */
END_WORKERS_NAMESPACE END_WORKERS_NAMESPACE

18
dom/workers/ServiceWorkerEvents.h
View File

@ -189,7 +189,8 @@ private:
class PushEvent final : public ExtendableEvent class PushEvent final : public ExtendableEvent
{ {
nsRefPtr<PushMessageData> mData; // FIXME(nsm): Bug 1149195.
// nsRefPtr<PushMessageData> mData;
nsMainThreadPtrHandle<ServiceWorker> mServiceWorker; nsMainThreadPtrHandle<ServiceWorker> mServiceWorker;
protected: protected:
@ -197,8 +198,8 @@ protected:
~PushEvent() {} ~PushEvent() {}
public: public:
NS_DECL_ISUPPORTS_INHERITED // FIXME(nsm): Bug 1149195.
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(PushEvent, ExtendableEvent) // Add cycle collection macros once data is re-exposed.
NS_FORWARD_TO_EVENT NS_FORWARD_TO_EVENT
virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override
@ -215,9 +216,10 @@ public:
bool trusted = e->Init(aOwner); bool trusted = e->Init(aOwner);
e->InitEvent(aType, aOptions.mBubbles, aOptions.mCancelable); e->InitEvent(aType, aOptions.mBubbles, aOptions.mCancelable);
e->SetTrusted(trusted); e->SetTrusted(trusted);
if(aOptions.mData.WasPassed()){ // FIXME(nsm): Bug 1149195.
e->mData = new PushMessageData(aOptions.mData.Value()); //if(aOptions.mData.WasPassed()){
} // e->mData = new PushMessageData(aOptions.mData.Value());
//}
return e.forget(); return e.forget();
} }
@ -238,7 +240,9 @@ public:
PushMessageData* Data() PushMessageData* Data()
{ {
return mData; // FIXME(nsm): Bug 1149195.
MOZ_CRASH("Should not be called!");
return nullptr;
} }
}; };
#endif /* ! MOZ_SIMPLEPUSH */ #endif /* ! MOZ_SIMPLEPUSH */

3
dom/workers/ServiceWorkerManager.cpp
View File

@ -2167,7 +2167,8 @@ public:
GlobalObject globalObj(aCx, aWorkerPrivate->GlobalScope()->GetWrapper()); GlobalObject globalObj(aCx, aWorkerPrivate->GlobalScope()->GetWrapper());
PushEventInit pei; PushEventInit pei;
pei.mData.Construct(mData); // FIXME(nsm): Bug 1149195.
// pei.mData.Construct(mData);
pei.mBubbles = false; pei.mBubbles = false;
pei.mCancelable = true; pei.mCancelable = true;