Bug 1072301 - Build the cross platform camera code in unified mode; r=mikeh
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 24 Sep 2014 18:43:26 -0400
changeset 207133 c9dafb021719ecacc645534601e39af562d8e856
parent 207132 f64e75d3179b28a19f4d52e6b3868af0899a8272
child 207134 2489b63b2493975d8d9b519b0e7a165ed2b074fd
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersmikeh
bugs1072301
milestone35.0a1
Bug 1072301 - Build the cross platform camera code in unified mode; r=mikeh
dom/camera/DOMCameraManager.cpp
dom/camera/moz.build
--- a/dom/camera/DOMCameraManager.cpp
+++ b/dom/camera/DOMCameraManager.cpp
@@ -46,17 +46,17 @@ GetCameraLog()
 {
   static PRLogModuleInfo *sLog;
   if (!sLog) {
     sLog = PR_NewLogModule("Camera");
   }
   return sLog;
 }
 
-WindowTable* nsDOMCameraManager::sActiveWindows = nullptr;
+::WindowTable* nsDOMCameraManager::sActiveWindows = nullptr;
 
 nsDOMCameraManager::nsDOMCameraManager(nsPIDOMWindow* aWindow)
   : mWindowId(aWindow->WindowID())
   , mPermission(nsIPermissionManager::DENY_ACTION)
   , mWindow(aWindow)
 {
   /* member initializers and constructor code */
   DOM_CAMERA_LOGT("%s:%d : this=%p, windowId=%llx\n", __func__, __LINE__, this, mWindowId);
@@ -104,17 +104,17 @@ nsDOMCameraManager::CheckPermission(nsPI
 }
 
 /* static */
 already_AddRefed<nsDOMCameraManager>
 nsDOMCameraManager::CreateInstance(nsPIDOMWindow* aWindow)
 {
   // Initialize the shared active window tracker
   if (!sActiveWindows) {
-    sActiveWindows = new WindowTable();
+    sActiveWindows = new ::WindowTable();
   }
 
   nsRefPtr<nsDOMCameraManager> cameraManager =
     new nsDOMCameraManager(aWindow);
 
   nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
   if (!obs) {
     DOM_CAMERA_LOGE("Camera manager failed to get observer service\n");
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -8,17 +8,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
     MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 
 EXPORTS += [
     'CameraCommon.h',
     'CameraPreferences.h',
     'DOMCameraManager.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'CameraControlImpl.cpp',
     'CameraPreferences.cpp',
     'CameraPreviewMediaStream.cpp',
     'CameraRecorderProfiles.cpp',
     'DOMCameraCapabilities.cpp',
     'DOMCameraControl.cpp',
     'DOMCameraControlListener.cpp',
     'DOMCameraDetectedFace.cpp',
@@ -33,17 +33,17 @@ if CONFIG['MOZ_B2G_CAMERA']:
         'GonkCameraParameters.cpp',
         'GonkCameraSource.cpp',
         'GonkRecorder.cpp',
         'GonkRecorderProfiles.cpp',
         'TestGonkCameraControl.cpp',
         'TestGonkCameraHardware.cpp',
     ]
 else:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'FallbackCameraControl.cpp',
         'FallbackCameraManager.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',