Bug 1262808 - Fix B2G bustage. r?gwagner draft
authorAndreas Pehrson <pehrsons@gmail.com>
Thu, 07 Apr 2016 14:55:34 +0200
changeset 348505 bfd1ae1d768e92dcbbf6532d4dd3bc502f6c7aeb
parent 348504 da8d6c4eab6142c98b04706255498750076fee9d
child 517852 e97a84f61db2d2f6096656127e517c40250755e0
push id14828
push userpehrsons@gmail.com
push dateThu, 07 Apr 2016 12:57:27 +0000
reviewersgwagner
bugs1262808
milestone48.0a1
Bug 1262808 - Fix B2G bustage. r?gwagner MozReview-Commit-ID: 8VVIAmG6MGZ
dom/media/DOMMediaStream.h
dom/media/webrtc/MediaEngineGonkVideoSource.cpp
--- a/dom/media/DOMMediaStream.h
+++ b/dom/media/DOMMediaStream.h
@@ -791,15 +791,15 @@ protected:
 private:
   void Init(MediaStream* aStream, OverlayImage* aImage);
 
 #ifdef MOZ_WIDGET_GONK
   const int DEFAULT_IMAGE_ID = 0x01;
   const int DEFAULT_IMAGE_WIDTH = 400;
   const int DEFAULT_IMAGE_HEIGHT = 300;
   RefPtr<OverlayImage> mOverlayImage;
-  PrincipalID mPrincipalHandle;
+  PrincipalHandle mPrincipalHandle;
 #endif
 };
 
 } // namespace mozilla
 
 #endif /* NSDOMMEDIASTREAM_H_ */
--- a/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
@@ -63,17 +63,17 @@ NS_IMPL_RELEASE_INHERITED(MediaEngineGon
 // Called if the graph thinks it's running out of buffered video; repeat
 // the last frame for whatever minimum period it think it needs. Note that
 // this means that no *real* frame can be inserted during this period.
 void
 MediaEngineGonkVideoSource::NotifyPull(MediaStreamGraph* aGraph,
                                        SourceMediaStream* aSource,
                                        TrackID aID,
                                        StreamTime aDesiredTime,
-                                       const PrincipalID& aPrincipalHandle)
+                                       const PrincipalHandle& aPrincipalHandle)
 {
   VideoSegment segment;
 
   MonitorAutoLock lock(mMonitor);
   // B2G does AddTrack, but holds kStarted until the hardware changes state.
   // So mState could be kReleased here. We really don't care about the state,
   // though.