wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 98bc69015608 (bug 1139721) for frequent b2g mochitest-5 failures

Browse Source
This commit is contained in:
Wes Kocher 2015-03-16 14:16:02 -07:00
parent bab08745ed
commit 426e79b69c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/camera/DOMCameraCapabilities.cpp
View File

@ -323,7 +323,6 @@ CameraCapabilities::CameraCapabilities(nsPIDOMWindow* aWindow,
, mCameraControl(aCameraControl)
{
DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
MOZ_COUNT_CTOR(CameraCapabilities);
if (mCameraControl) {
mListener = new CameraClosedListenerProxy<CameraCapabilities>(this);
mCameraControl->AddListener(mListener);

11
dom/camera/DOMCameraControl.cpp
View File

@ -306,7 +306,7 @@ nsDOMCameraControl::nsDOMCameraControl(uint32_t aCameraId,
nsDOMCameraControl::~nsDOMCameraControl()
{
DOM_CAMERA_LOGT("%s:%d : this=%p\n", __func__, __LINE__, this);
/*invoke DOMMediaStream destroy*/
/*invoke DOMMdediastream destroy*/
Destroy();
}
@ -1373,9 +1373,10 @@ nsDOMCameraControl::OnFacesDetected(const nsTArray<ICameraControl::Face>& aFaces
uint32_t len = aFaces.Length();
if (faces.SetCapacity(len)) {
nsRefPtr<DOMCameraDetectedFace> f;
for (uint32_t i = 0; i < len; ++i) {
*faces.AppendElement() =
new DOMCameraDetectedFace(static_cast<DOMMediaStream*>(this), aFaces[i]);
f = new DOMCameraDetectedFace(static_cast<DOMMediaStream*>(this), aFaces[i]);
*faces.AppendElement() = f.forget().take();
}
}
@ -1426,10 +1427,6 @@ nsDOMCameraControl::OnUserError(CameraControlListener::UserContext aContext, nsr
switch (aContext) {
case CameraControlListener::kInStartCamera:
promise = mGetCameraPromise.forget();
// If we failed to open the camera, we never actually provided a reference
// for the application to release explicitly. Thus we must clear our handle
// here to ensure everything is freed.
mCameraControl = nullptr;
break;
case CameraControlListener::kInStopCamera: