Bug 1264497 - Call GMPSetNodeId in GMPLoader. r=gerald a=ritu
authorChris Pearce <cpearce@mozilla.com>
Fri, 06 May 2016 14:49:12 +1200
changeset 332791 ab5c53d6a29b302eeb924dde9e8b0d8494dfd6ec
parent 332790 b72de38736248444009bfef8043ced0f15383776
child 332792 9e517a5f0b04812c571945218a0a34716f746468
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald, ritu
bugs1264497
milestone48.0a2
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)