Bug 1208371 - Remove some no longer necessary principal methods on DOMMediaStream. r?mt
MozReview-Commit-ID: LTVhpY6Bzgf
--- a/dom/media/DOMMediaStream.cpp
+++ b/dom/media/DOMMediaStream.cpp
@@ -755,33 +755,17 @@ DOMMediaStream::ApplyConstraintsToTrack(
promise->MaybeReject(new MediaStreamError(
mWindow,
NS_LITERAL_STRING("OverconstrainedError"),
NS_LITERAL_STRING(""),
NS_LITERAL_STRING("")));
return promise.forget();
}
-bool
-DOMMediaStream::CombineWithPrincipal(nsIPrincipal* aPrincipal)
-{
- bool changed =
- nsContentUtils::CombineResourcePrincipals(&mPrincipal, aPrincipal);
- if (changed) {
- NotifyPrincipalChanged();
- }
- return changed;
-}
-void
-DOMMediaStream::SetPrincipal(nsIPrincipal* aPrincipal)
-{
- mPrincipal = aPrincipal;
- NotifyPrincipalChanged();
-}
void
DOMMediaStream::PrincipalChanged(MediaStreamTrack* aTrack)
{
MOZ_ASSERT(aTrack);
NS_ASSERTION(HasTrack(*aTrack), "Principal changed for an unknown track");
LOG(LogLevel::Info, ("DOMMediaStream %p Principal changed for track %p",
this, aTrack));
--- a/dom/media/DOMMediaStream.h
+++ b/dom/media/DOMMediaStream.h
@@ -438,30 +438,17 @@ public:
* If this is set, then mPrincipal should be an instance of nsNullPrincipal.
*/
PeerIdentity* GetPeerIdentity() const { return mPeerIdentity; }
void SetPeerIdentity(PeerIdentity* aPeerIdentity)
{
mPeerIdentity = aPeerIdentity;
}
- /**
- * Indicate that data will be contributed to this stream from origin aPrincipal.
- * If aPrincipal is null, this is ignored. Otherwise, from now on the contents
- * of this stream can only be accessed by principals that subsume aPrincipal.
- * Returns true if the stream's principal changed.
- */
- bool CombineWithPrincipal(nsIPrincipal* aPrincipal);
- /**
- * This is used in WebRTC to move from a protected state (nsNullPrincipal) to
- * one where the stream is accessible to script. Don't call this.
- * CombineWithPrincipal is almost certainly more appropriate.
- */
- void SetPrincipal(nsIPrincipal* aPrincipal);
// From PrincipalChangeObserver<MediaStreamTrack>.
void PrincipalChanged(MediaStreamTrack* aTrack) override;
/**
* Add a PrincipalChangeObserver to this stream.
*
* Returns true if it was successfully added.