Bug 703491. Silence useless assertion. r=bas
authorRobert O'Callahan <robert@ocallahan.org>
Mon, 21 Nov 2011 17:40:11 +1300
changeset 80549 7b1567ef9a576c900bc86d155f402c4f0c0ef211
parent 80548 5d052a4d8f2b47ad091ba9d3fcc7d2a0010f09d1
child 80550 7742dd3cab64a91d8aa8f39061e551f62733c05e
push id21505
push usermbrubeck@mozilla.com
push dateMon, 21 Nov 2011 16:45:45 +0000
treeherdermozilla-central@9276e3274f18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbas
bugs703491
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 703491. Silence useless assertion. r=bas
gfx/layers/d3d9/Nv3DVUtils.cpp
--- a/gfx/layers/d3d9/Nv3DVUtils.cpp
+++ b/gfx/layers/d3d9/Nv3DVUtils.cpp
@@ -122,23 +122,25 @@ Nv3DVUtils::SetDeviceInfo(IUnknown *devU
   }
 
   if (!m3DVStreaming) {
       return;
   }
 
   bool rv = false;
   rv = m3DVStreaming->Nv3DVSetDevice(devUnknown);
-  if (!rv) {
+  if (NS_FAILED(rv)) {
       NS_WARNING("Nv3DVStreaming Nv3DVControl failed!");
       return;
   }
 
   rv = m3DVStreaming->Nv3DVControl(NV_STEREO_MODE_RIGHT_LEFT, true, FIREFOX_3DV_APP_HANDLE);
-  NS_ASSERTION(rv, "Nv3DVStreaming Nv3DVControl failed!");
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Nv3DVStreaming Nv3DVControl failed!");
+  }
 }
 
 /*
  * Send Stereo Control Information. Used mainly to re-route 
  * calls from ImageLayerD3D9 to the 3DV COM object
  */
 void 
 Nv3DVUtils::SendNv3DVControl(Nv_Stereo_Mode eStereoMode, bool bEnableStereo, DWORD dw3DVAppHandle)