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 1130041 - UNIFIED_SOURCE for BroadcastChannel, r=smaug

Browse Source
This commit is contained in:
Andrea Marchesini 2015-02-06 11:06:35 +00:00
parent c5b0027f36
commit 80d96f5117
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/broadcastchannel/BroadcastChannel.cpp
View File

@ -195,13 +195,13 @@ private:
ErrorResult& mRv;
};
class PostMessageRunnable MOZ_FINAL : public nsICancelableRunnable
class BCPostMessageRunnable MOZ_FINAL : public nsICancelableRunnable
{
public:
NS_DECL_ISUPPORTS
PostMessageRunnable(BroadcastChannelChild* aActor,
BroadcastChannelMessage* aData)
BCPostMessageRunnable(BroadcastChannelChild* aActor,
BroadcastChannelMessage* aData)
: mActor(aActor)
, mData(aData)
{
@ -249,13 +249,13 @@ public:
}
private:
~PostMessageRunnable() {}
~BCPostMessageRunnable() {}
nsRefPtr<BroadcastChannelChild> mActor;
nsRefPtr<BroadcastChannelMessage> mData;
};
NS_IMPL_ISUPPORTS(PostMessageRunnable, nsICancelableRunnable, nsIRunnable)
NS_IMPL_ISUPPORTS(BCPostMessageRunnable, nsICancelableRunnable, nsIRunnable)
class CloseRunnable MOZ_FINAL : public nsICancelableRunnable
{
@ -559,8 +559,8 @@ void
BroadcastChannel::PostMessageData(BroadcastChannelMessage* aData)
{
if (mActor) {
nsRefPtr<PostMessageRunnable> runnable =
new PostMessageRunnable(mActor, aData);
nsRefPtr<BCPostMessageRunnable> runnable =
new BCPostMessageRunnable(mActor, aData);
if (NS_FAILED(NS_DispatchToCurrentThread(runnable))) {
NS_WARNING("Failed to dispatch to the current thread!");

2
dom/broadcastchannel/moz.build
View File

@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
'BroadcastChannel.h',
]
SOURCES += [
UNIFIED_SOURCES += [
'BroadcastChannel.cpp',
'BroadcastChannelChild.cpp',
'BroadcastChannelParent.cpp',

6
dom/events/MessageEvent.cpp
View File

@ -200,6 +200,12 @@ MessageEvent::SetPorts(MessagePortList* aPorts)
mPorts = aPorts;
}
void
MessageEvent::SetSource(mozilla::dom::MessagePort* aPort)
{
mPortSource = aPort;
}
} // namespace dom
} // namespace mozilla

5
dom/events/MessageEvent.h
View File

@ -58,10 +58,7 @@ public:
void SetPorts(MessagePortList* aPorts);
// Non WebIDL methods
void SetSource(mozilla::dom::MessagePort* aPort)
{
mPortSource = aPort;
}
void SetSource(mozilla::dom::MessagePort* aPort);
void SetSource(nsPIDOMWindow* aWindow)
{