From 3bb9f45fe84a62d4ff4f35b38e1e13b9ec98ee47 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Thu, 5 Feb 2015 10:33:00 +0100
Subject: [PATCH] Bug 1130041 - "UNIFIED_SOURCE for BroadcastChannel" r=smaug

---
 dom/broadcastchannel/BroadcastChannel.cpp | 14 +++++++-------
 dom/broadcastchannel/moz.build            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dom/broadcastchannel/BroadcastChannel.cpp b/dom/broadcastchannel/BroadcastChannel.cpp
index fbd103267b95..96b7c35123d8 100644
--- a/dom/broadcastchannel/BroadcastChannel.cpp
+++ b/dom/broadcastchannel/BroadcastChannel.cpp
@@ -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!");
diff --git a/dom/broadcastchannel/moz.build b/dom/broadcastchannel/moz.build
index 01c795f8743e..6ff7e04872cf 100644
--- a/dom/broadcastchannel/moz.build
+++ b/dom/broadcastchannel/moz.build
@@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
     'BroadcastChannel.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'BroadcastChannel.cpp',
     'BroadcastChannelChild.cpp',
     'BroadcastChannelParent.cpp',