Backed out changeset 6b3566842a84 (bug 1390453) for ASan permaorange in test_eme_canvas_blocked.html
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 16 Aug 2017 20:58:18 -0700
changeset 375245 932388b8c22c9775264e543697ce918415db9e23
parent 375210 63ca686c3f1e870649b6d9c559973d100573aec2
child 375246 b1896d5b01c51f42f6154c550ebd27cae201525e
child 375430 fcd32d51e2a84d8b2e5df5186bd63a1e7935b504
push id48993
push userphilringnalda@gmail.com
push dateThu, 17 Aug 2017 04:05:31 +0000
treeherderautoland@b1896d5b01c5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1390453
milestone57.0a1
backs out6b3566842a841b0227fb3ad6bc392ae00c89e288
first release with
nightly linux32
932388b8c22c / 57.0a1 / 20170817100132 / files
nightly linux64
932388b8c22c / 57.0a1 / 20170817100132 / files
nightly mac
932388b8c22c / 57.0a1 / 20170817100132 / files
nightly win32
932388b8c22c / 57.0a1 / 20170817100132 / files
nightly win64
932388b8c22c / 57.0a1 / 20170817100132 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 6b3566842a84 (bug 1390453) for ASan permaorange in test_eme_canvas_blocked.html MozReview-Commit-ID: 7kGuQ4YGPuj
dom/media/gmp/ChromiumCDMAdapter.cpp
--- a/dom/media/gmp/ChromiumCDMAdapter.cpp
+++ b/dom/media/gmp/ChromiumCDMAdapter.cpp
@@ -46,49 +46,45 @@ ChromiumCdmHost(int aHostInterfaceVersio
     return nullptr;
   }
   return static_cast<cdm::Host_8*>(aUserData);
 }
 
 #define STRINGIFY(s) _STRINGIFY(s)
 #define _STRINGIFY(s) #s
 
-#ifdef MOZILLA_OFFICIAL
 static cdm::HostFile
 TakeToCDMHostFile(HostFileData& aHostFileData)
 {
   return cdm::HostFile(aHostFileData.mBinary.Path().get(),
                        aHostFileData.mBinary.TakePlatformFile(),
                        aHostFileData.mSig.TakePlatformFile());
 }
-#endif
 
 GMPErr
 ChromiumCDMAdapter::GMPInit(const GMPPlatformAPI* aPlatformAPI)
 {
   CDM_LOG("ChromiumCDMAdapter::GMPInit");
   sPlatform = aPlatformAPI;
   if (!mLib) {
     return GMPGenericErr;
   }
 
-#ifdef MOZILLA_OFFICIAL
   // Note: we must call the VerifyCdmHost_0 function if it's present before
   // we call the initialize function.
   auto verify = reinterpret_cast<decltype(::VerifyCdmHost_0)*>(
     PR_FindFunctionSymbol(mLib, STRINGIFY(VerifyCdmHost_0)));
   if (verify) {
     nsTArray<cdm::HostFile> files;
     for (HostFileData& hostFile : mHostFiles) {
       files.AppendElement(TakeToCDMHostFile(hostFile));
     }
     bool result = verify(files.Elements(), files.Length());
     GMP_LOG("%s VerifyCdmHost_0 returned %d", __func__, result);
   }
-#endif
 
   auto init = reinterpret_cast<decltype(::INITIALIZE_CDM_MODULE)*>(
     PR_FindFunctionSymbol(mLib, STRINGIFY(INITIALIZE_CDM_MODULE)));
   if (!init) {
     return GMPGenericErr;
   }
 
   CDM_LOG(STRINGIFY(INITIALIZE_CDM_MODULE)"()");