Bug 1268714 - Check for failure result or a failed nsresult from SendLoadGMP. r=mccr8
authorJim Mathies <jmathies@mozilla.com>
Fri, 29 Apr 2016 13:24:30 -0500
changeset 295538 c9ed1f5f53583d071883ec3b1a8716ede3f76efb
parent 295537 3dfd039e8de2b2caaa6eb6e3be302a51f5313995
child 295539 30f40e324c976988993d46f5b64466cf5c842f86
push id19015
push usercbook@mozilla.com
push dateMon, 02 May 2016 09:39:23 +0000
treeherderfx-team@2080375bc69d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1268714
milestone49.0a1
Bug 1268714 - Check for failure result or a failed nsresult from SendLoadGMP. r=mccr8 MozReview-Commit-ID: 9bE9hfXiBI5
dom/media/gmp/GMPServiceChild.cpp
--- a/dom/media/gmp/GMPServiceChild.cpp
+++ b/dom/media/gmp/GMPServiceChild.cpp
@@ -71,17 +71,17 @@ public:
 
     base::ProcessId otherProcess;
     nsCString displayName;
     uint32_t pluginId;
     nsresult rv;
     bool ok = aGMPServiceChild->SendLoadGMP(mNodeId, mAPI, mTags,
                                             alreadyBridgedTo, &otherProcess,
                                             &displayName, &pluginId, &rv);
-    if (!ok && rv == NS_ERROR_ILLEGAL_DURING_SHUTDOWN) {
+    if (!ok || rv == NS_ERROR_ILLEGAL_DURING_SHUTDOWN) {
       mCallback->Done(nullptr);
       return;
     }
 
     RefPtr<GMPContentParent> parent;
     aGMPServiceChild->GetBridgedGMPContentParent(otherProcess,
                                                  getter_AddRefs(parent));
     if (!alreadyBridgedTo.Contains(otherProcess)) {