Bug 1264497 - Call GMPSetNodeId in GMPLoader. r?gerald draft
authorChris Pearce <cpearce@mozilla.com>
Fri, 06 May 2016 14:49:12 +1200
changeset 364181 50c4bc8c4b6274226011f75d2724a3a2d877c20d
parent 363870 e5a10bc7dac4ee2453d8319165c1f6578203eac7
child 520204 f9b860ca0abdcd6ea9a25ecd69f463522d969004
push id17379
push usercpearce@mozilla.com
push dateFri, 06 May 2016 02:49:59 +0000
reviewersgerald
bugs1264497
milestone49.0a1
Bug 1264497 - Call GMPSetNodeId in GMPLoader. r?gerald 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)