Bug 1262970 - Change PRINCIPAL_HANDLE_NONE to a nullptr #define. r=froydnj
authorAndreas Pehrson <pehrsons@gmail.com>
Thu, 14 Apr 2016 11:39:11 +0200
changeset 331271 24eb2f310602f25dbc75103b631adfbcc9d7d1d1
parent 331270 6bbf05ba56d8d6eac6474d1ed678c8acfb160467
child 331272 e673dbc9848f2ae4cd11911e7b9fae8e4757cd0e
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1262970
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1262970 - Change PRINCIPAL_HANDLE_NONE to a nullptr #define. r=froydnj MozReview-Commit-ID: A69mWTDTkkP
dom/media/MediaSegment.h
media/webrtc/signaling/test/FakeMediaStreamsImpl.h
--- a/dom/media/MediaSegment.h
+++ b/dom/media/MediaSegment.h
@@ -66,17 +66,17 @@ typedef nsMainThreadPtrHandle<nsIPrincip
 
 inline PrincipalHandle MakePrincipalHandle(nsIPrincipal* aPrincipal)
 {
   RefPtr<nsMainThreadPtrHolder<nsIPrincipal>> holder =
     new nsMainThreadPtrHolder<nsIPrincipal>(aPrincipal);
   return PrincipalHandle(holder);
 }
 
-const PrincipalHandle PRINCIPAL_HANDLE_NONE(nullptr);
+#define PRINCIPAL_HANDLE_NONE nullptr
 
 inline nsIPrincipal* GetPrincipalFromHandle(PrincipalHandle& aPrincipalHandle)
 {
   MOZ_ASSERT(NS_IsMainThread());
   return aPrincipalHandle.get();
 }
 
 inline bool PrincipalHandleMatches(PrincipalHandle& aPrincipalHandle,
--- a/media/webrtc/signaling/test/FakeMediaStreamsImpl.h
+++ b/media/webrtc/signaling/test/FakeMediaStreamsImpl.h
@@ -116,17 +116,17 @@ void Fake_AudioStreamSource::Periodic() 
   }
 
   mozilla::AudioSegment segment;
   AutoTArray<const int16_t *,1> channels;
   channels.AppendElement(data);
   segment.AppendFrames(samples.forget(),
                        channels,
                        AUDIO_BUFFER_SIZE,
-                       mozilla::PRINCIPAL_HANDLE_NONE);
+                       PRINCIPAL_HANDLE_NONE);
 
   for(std::set<RefPtr<Fake_MediaStreamListener>>::iterator it = mListeners.begin();
        it != mListeners.end(); ++it) {
     (*it)->NotifyQueuedTrackChanges(nullptr, // Graph
                                     0, // TrackID
                                     0, // Offset TODO(ekr@rtfm.com) fix
                                     0, // ???
                                     segment,