Bug 1121855 - Fix camera crash. r=aosmond
authorBecker Hsieh <behsieh@mozilla.com>
Thu, 12 Mar 2015 20:29:00 -0400
changeset 262343 ae105bf20177db5ba1dd240f84ac626ae2a4eff2
parent 262342 9632123ed4c3391a6f4d95d075b907ba487310a6
child 262344 9379160419158cec5b8657620c8ebfa9fef44926
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaosmond
bugs1121855
milestone39.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 1121855 - Fix camera crash. r=aosmond
dom/camera/DOMCameraControl.cpp
old mode 100644
new mode 100755
--- a/dom/camera/DOMCameraControl.cpp
+++ b/dom/camera/DOMCameraControl.cpp
@@ -301,16 +301,18 @@ nsDOMCameraControl::nsDOMCameraControl(u
   if (NS_FAILED(rv)) {
     mListener->OnUserError(DOMCameraControlListener::kInStartCamera, rv);
   }
 }
 
 nsDOMCameraControl::~nsDOMCameraControl()
 {
   DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
+  /*invoke DOMMdediastream destroy*/
+  Destroy();
 }
 
 JSObject*
 nsDOMCameraControl::WrapObject(JSContext* aCx)
 {
   return CameraControlBinding::Wrap(aCx, this);
 }