diff -r 000000000000 -r 6474c204b198 dom/camera/CameraControlImpl.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/camera/CameraControlImpl.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,133 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef DOM_CAMERA_CAMERACONTROLIMPL_H
+#define DOM_CAMERA_CAMERACONTROLIMPL_H
+
+#include "nsTArray.h"
+#include "nsWeakPtr.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/ReentrantMonitor.h"
+#include "nsIFile.h"
+#include "nsProxyRelease.h"
+#include "AutoRwLock.h"
+#include "nsIDOMDeviceStorage.h"
+#include "ICameraControl.h"
+#include "CameraCommon.h"
+#include "DeviceStorage.h"
+#include "DeviceStorageFileDescriptor.h"
+#include "CameraControlListener.h"
+
+namespace mozilla {
+
+namespace layers {
+  class Image;
+}
+
+class RecorderProfileManager;
+
+class CameraControlImpl : public ICameraControl
+{
+public:
+  CameraControlImpl(uint32_t aCameraId);
+  virtual void AddListener(CameraControlListener* aListener) MOZ_OVERRIDE;
+  virtual void RemoveListener(CameraControlListener* aListener) MOZ_OVERRIDE;
+
+  virtual nsresult Start(const Configuration* aConfig = nullptr) MOZ_OVERRIDE;
+  virtual nsresult Stop() MOZ_OVERRIDE;
+
+  virtual nsresult SetConfiguration(const Configuration& aConfig) MOZ_OVERRIDE;
+  virtual nsresult StartPreview() MOZ_OVERRIDE;
+  virtual nsresult StopPreview() MOZ_OVERRIDE;
+  virtual nsresult AutoFocus() MOZ_OVERRIDE;
+  virtual nsresult StartFaceDetection() MOZ_OVERRIDE;
+  virtual nsresult StopFaceDetection() MOZ_OVERRIDE;
+  virtual nsresult TakePicture() MOZ_OVERRIDE;
+  virtual nsresult StartRecording(DeviceStorageFileDescriptor* aFileDescriptor,
+                                  const StartRecordingOptions* aOptions) MOZ_OVERRIDE;
+  virtual nsresult StopRecording() MOZ_OVERRIDE;
+  virtual nsresult ResumeContinuousFocus() MOZ_OVERRIDE;
+
+  already_AddRefed<RecorderProfileManager> GetRecorderProfileManager();
+  uint32_t GetCameraId() { return mCameraId; }
+
+  virtual void Shutdown() MOZ_OVERRIDE;
+
+  // Event handlers called directly from outside this class.
+  void OnShutter();
+  void OnClosed();
+  void OnError(CameraControlListener::CameraErrorContext aContext,
+               CameraControlListener::CameraError aError);
+  void OnAutoFocusMoving(bool aIsMoving);
+
+protected:
+  // Event handlers.
+  void OnAutoFocusComplete(bool aAutoFocusSucceeded);
+  void OnFacesDetected(const nsTArray<Face>& aFaces);
+  void OnTakePictureComplete(uint8_t* aData, uint32_t aLength, const nsAString& aMimeType);
+
+  bool OnNewPreviewFrame(layers::Image* aImage, uint32_t aWidth, uint32_t aHeight);
+  void OnRecorderStateChange(CameraControlListener::RecorderState aState,
+                             int32_t aStatus = -1, int32_t aTrackNumber = -1);
+  void OnPreviewStateChange(CameraControlListener::PreviewState aState);
+  void OnHardwareStateChange(CameraControlListener::HardwareState aState);
+  void OnConfigurationChange();
+
+  // When we create a new CameraThread, we keep a static reference to it so
+  // that multiple CameraControl instances can find and reuse it; but we
+  // don't want that reference to keep the thread object around unnecessarily,
+  // so we make it a weak reference. The strong dynamic references will keep
+  // the thread object alive as needed.
+  static nsWeakPtr sCameraThread;
+  nsCOMPtr<nsIThread> mCameraThread;
+
+  virtual ~CameraControlImpl();
+
+  virtual void BeginBatchParameterSet() MOZ_OVERRIDE { }
+  virtual void EndBatchParameterSet() MOZ_OVERRIDE { }
+
+  // Manage camera event listeners.
+  void AddListenerImpl(already_AddRefed<CameraControlListener> aListener);
+  void RemoveListenerImpl(CameraControlListener* aListener);
+  nsTArray<nsRefPtr<CameraControlListener> > mListeners;
+  PRRWLock* mListenerLock;
+
+  class ControlMessage;
+  class ListenerMessage;
+
+  virtual nsresult StartImpl(const Configuration* aConfig = nullptr) = 0;
+  virtual nsresult StopImpl() = 0;
+  virtual nsresult SetConfigurationImpl(const Configuration& aConfig) = 0;
+  virtual nsresult StartPreviewImpl() = 0;
+  virtual nsresult StopPreviewImpl() = 0;
+  virtual nsresult AutoFocusImpl() = 0;
+  virtual nsresult StartFaceDetectionImpl() = 0;
+  virtual nsresult StopFaceDetectionImpl() = 0;
+  virtual nsresult TakePictureImpl() = 0;
+  virtual nsresult StartRecordingImpl(DeviceStorageFileDescriptor* aFileDescriptor,
+                                      const StartRecordingOptions* aOptions) = 0;
+  virtual nsresult StopRecordingImpl() = 0;
+  virtual nsresult ResumeContinuousFocusImpl() = 0;
+  virtual nsresult PushParametersImpl() = 0;
+  virtual nsresult PullParametersImpl() = 0;
+  virtual already_AddRefed<RecorderProfileManager> GetRecorderProfileManagerImpl() = 0;
+
+  void OnShutterInternal();
+  void OnClosedInternal();
+
+  uint32_t mCameraId;
+
+  CameraControlListener::CameraListenerConfiguration mCurrentConfiguration;
+
+  CameraControlListener::PreviewState   mPreviewState;
+  CameraControlListener::HardwareState  mHardwareState;
+
+private:
+  CameraControlImpl(const CameraControlImpl&) MOZ_DELETE;
+  CameraControlImpl& operator=(const CameraControlImpl&) MOZ_DELETE;
+};
+
+} // namespace mozilla
+
+#endif // DOM_CAMERA_CAMERACONTROLIMPL_H