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 4fb349c12a63 (bug 977372) for b2g ics emulator debug m8 test failure

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-03-06 09:16:43 +01:00
parent a6cc370084
commit f7378c3ae7
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/camera/DOMCameraControl.cpp
View File

@ -11,7 +11,6 @@
#include "DeviceStorage.h"
#include "DeviceStorageFileDescriptor.h"
#include "mozilla/dom/TabChild.h"
#include "mozilla/ipc/FileDescriptorUtils.h"
#include "mozilla/MediaManager.h"
#include "mozilla/Services.h"
#include "mozilla/unused.h"
@ -35,7 +34,6 @@
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::idl;
using namespace mozilla::ipc;
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMCameraControl)
NS_INTERFACE_MAP_ENTRY(nsISupports)
@ -730,14 +728,8 @@ nsDOMCameraControl::OnCreatedFileDescriptor(bool aSucceeded)
return;
}
}
OnError(CameraControlListener::kInStartRecording, NS_LITERAL_STRING("FAILURE"));
// An error occured. We need to manually close the file associated with the
// FileDescriptor, and we shouldn't do this on the main thread, so we
// use a little helper.
nsRefPtr<CloseFileRunnable> closer =
new CloseFileRunnable(mDSFileDescriptor->mFileDescriptor);
closer->Dispatch();
OnError(CameraControlListener::kInStartRecording, NS_LITERAL_STRING("FAILURE"));
}
void

8
dom/camera/GonkCameraControl.cpp
View File

@ -30,7 +30,6 @@
#include "mozilla/FileUtils.h"
#include "mozilla/Services.h"
#include "mozilla/unused.h"
#include "mozilla/ipc/FileDescriptorUtils.h"
#include "nsAlgorithm.h"
#include <media/mediaplayer.h>
#include "nsPrintfCString.h"
@ -47,7 +46,6 @@
using namespace mozilla;
using namespace mozilla::layers;
using namespace mozilla::gfx;
using namespace mozilla::ipc;
using namespace android;
#define RETURN_IF_NO_CAMERA_HW() \
@ -857,12 +855,6 @@ nsGonkCameraControl::StartRecordingImpl(DeviceStorageFileDescriptor* aFileDescri
return NS_ERROR_INVALID_ARG;
}
// SetupRecording creates a dup of the file descriptor, so we need to
// close the file descriptor when we leave this function. Also note, that
// since we're already off the main thread, we don't need to dispatch this.
// We just let the CloseFileRunnable destructor do the work.
nsRefPtr<CloseFileRunnable> closer =
new CloseFileRunnable(aFileDescriptor->mFileDescriptor);
nsresult rv;
int fd = aFileDescriptor->mFileDescriptor.PlatformHandle();
if (aOptions) {