Bug 1264497 - Call GMPSetNodeId in GMPLoader. r=gerald,a=ritu
authorChris Pearce <cpearce@mozilla.com>
Fri, 06 May 2016 14:49:12 +1200
changeset 326193 073989f714c8ade2740d57fa6b64b9ea388e88a0
parent 326192 5f0df9e62467f647b93c1df8dbec87227c0d1cb6
child 326194 254daaf1315f97c19f2fbd9dbefae7ec2f135399
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald, ritu
bugs1264497
milestone47.0
Bug 1264497 - Call GMPSetNodeId in GMPLoader. r=gerald,a=ritu MozReview-Commit-ID: I6BApLKpjPS
dom/media/gmp/GMPLoader.cpp
--- a/dom/media/gmp/GMPLoader.cpp
+++ b/dom/media/gmp/GMPLoader.cpp
@@ -339,17 +339,21 @@ GMPLoaderImpl::Load(const char* aUTF8Lib
     return false;
   }
 
   // Note: PassThroughGMPAdapter's code must remain in this file so that it's
   // covered by Adobe's plugin-container voucher.
   mAdapter.reset((!aAdapter) ? new PassThroughGMPAdapter() : aAdapter);
   mAdapter->SetAdaptee(lib);
 
-  mAdapter->GMPInit(aPlatformAPI);
+  if (mAdapter->GMPInit(aPlatformAPI) != GMPNoErr) {
+    return false;
+  }
+
+  mAdapter->GMPSetNodeId(nodeId.c_str(), nodeId.size());
 
   return true;
 }
 
 GMPErr
 GMPLoaderImpl::GetAPI(const char* aAPIName,
                       void* aHostAPI,
                       void** aPluginAPI)