Backed out changeset 591c42f40cbe (bug 1340163)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 20 Mar 2017 15:37:23 +0100
changeset 348422 aad74c60564368209d819fa264b7719101faacb4
parent 348421 5c8ae52e3fc7f3ae25858ff1efdd348a5e5ae8a2
child 348423 324a8b9f44f4c1cc71022fa2e9279526374c5bfe
push id88210
push userarchaeopteryx@coole-files.de
push dateMon, 20 Mar 2017 14:38:35 +0000
treeherdermozilla-inbound@324a8b9f44f4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1340163
milestone55.0a1
backs out591c42f40cbe13f41ed8a8cbe9b0a8fde563b775
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
Backed out changeset 591c42f40cbe (bug 1340163)
dom/media/systemservices/MediaParent.cpp
--- a/dom/media/systemservices/MediaParent.cpp
+++ b/dom/media/systemservices/MediaParent.cpp
@@ -102,38 +102,38 @@ class OriginKeyStore : public nsISupport
         }
       }
       mPersistCount = 0;
     }
 
   private:
     void
     PrincipalInfoToString(const ipc::PrincipalInfo& aPrincipalInfo,
-                          nsACString& aString)
+                          nsAutoCString aString)
     {
       switch (aPrincipalInfo.type()) {
         case ipc::PrincipalInfo::TSystemPrincipalInfo:
           aString.Assign("[System Principal]");
           return;
 
         case ipc::PrincipalInfo::TNullPrincipalInfo: {
           const ipc::NullPrincipalInfo& info =
             aPrincipalInfo.get_NullPrincipalInfo();
           aString.Assign(info.spec());
           return;
         }
 
         case ipc::PrincipalInfo::TContentPrincipalInfo: {
           const ipc::ContentPrincipalInfo& info =
             aPrincipalInfo.get_ContentPrincipalInfo();
-          aString.Assign(info.originNoSuffix());
+          aString.Assign(info.spec());
 
           nsAutoCString suffix;
           info.attrs().CreateSuffix(suffix);
-          aString.Append(suffix);
+          suffix.Append(suffix);
           return;
         }
 
         case ipc::PrincipalInfo::TExpandedPrincipalInfo: {
           const ipc::ExpandedPrincipalInfo& info =
             aPrincipalInfo.get_ExpandedPrincipalInfo();
 
           aString.Assign("[Expanded Principal [");