Backing out bug 738528 pushed without a peer review and with wrong authorship.
authorMounir Lamouri <mounir.lamouri@gmail.com>
Mon, 04 Jun 2012 10:57:42 +0200
changeset 95746 1fa953e7d4c15b19a763b888e1f22ecb1ff81d05
parent 95745 a6cee80d4fde9442df8bf9a5b5d4cad6656ed5fa
child 95747 778ba119ded663eb5520f57fdf5df13785db69d2
push idunknown
push userunknown
push dateunknown
bugs738528
milestone15.0a1
Backing out bug 738528 pushed without a peer review and with wrong authorship.
content/media/MediaEngineDefault.cpp
mobile/android/confvars.sh
--- a/content/media/MediaEngineDefault.cpp
+++ b/content/media/MediaEngineDefault.cpp
@@ -1,19 +1,13 @@
 /* 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/. */
 
 #include "MediaEngineDefault.h"
-#include "nsDOMFile.h"
-
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidBridge.h"
-#include "nsISupportsUtils.h"
-#endif
 
 #define WIDTH 320
 #define HEIGHT 240
 #define FPS 10
 #define CHANNELS 1
 #define RATE USECS_PER_S
 
 namespace mozilla {
@@ -150,37 +144,18 @@ MediaEngineDefaultVideoSource::Stop()
 
   mState = kStopped;
   return NS_OK;
 }
 
 nsresult
 MediaEngineDefaultVideoSource::Snapshot(PRUint32 aDuration, nsIDOMFile** aFile)
 {
-  *aFile = nsnull;
-
-#ifndef MOZ_WIDGET_ANDROID
-  return NS_ERROR_NOT_IMPLEMENTED;
-#else
-  if (!AndroidBridge::Bridge()) {
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  nsAutoString filePath;
-  AndroidBridge::Bridge()->ShowFilePickerForMimeType(filePath, NS_LITERAL_STRING("image/*"));
-
-  nsCOMPtr<nsILocalFile> localFile;
-  nsresult rv = NS_NewLocalFile(filePath, false, getter_AddRefs(localFile));
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  NS_ADDREF(*aFile = new nsDOMFileFile(localFile));
-  return NS_OK;
-#endif
+   *aFile = nsnull;
+   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 MediaEngineDefaultVideoSource::Notify(nsITimer* aTimer)
 {
   VideoSegment segment;
 
   nsRefPtr<layers::PlanarYCbCrImage> image = mImage;
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -12,19 +12,16 @@ MOZ_BRANDING_DIRECTORY=mobile/android/br
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_SAFE_BROWSING=
 MOZ_SERVICES_SYNC=
 
 MOZ_DISABLE_DOMCRYPTO=1
 
-# Enable getUserMedia
-MOZ_MEDIA_NAVIGATOR=1
-
 if test "$LIBXUL_SDK"; then
 MOZ_XULRUNNER=1
 else
 MOZ_XULRUNNER=
 MOZ_PLACES=1
 fi
 
 MOZ_CAPTURE=1