From 55c0eb17ab4e4fa6a3a34971329d0a1b0e9bc1be Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Wed, 10 Dec 2014 09:06:02 -0800
Subject: [PATCH] bug 1088758 - Add the ability to mirror tabs from desktop to
 a second screen, restrict privledged GuM based on calling compartment rather
 than passed window's document r=rjesup

---
 dom/media/MediaManager.cpp                            | 2 +-
 dom/media/webspeech/recognition/SpeechRecognition.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index e7d5705b941..ae8fbf70de6 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -1580,7 +1580,7 @@ MediaManager::GetUserMedia(
   NS_ENSURE_TRUE(aOnFailure, NS_ERROR_NULL_POINTER);
   NS_ENSURE_TRUE(aOnSuccess, NS_ERROR_NULL_POINTER);
 
-  bool privileged = nsContentUtils::IsChromeDoc(aWindow->GetExtantDoc());
+  bool privileged = nsContentUtils::IsCallerChrome();
 
   nsCOMPtr<nsIDOMGetUserMediaSuccessCallback> onSuccess(aOnSuccess);
   nsCOMPtr<nsIDOMGetUserMediaErrorCallback> onFailure(aOnFailure);
diff --git a/dom/media/webspeech/recognition/SpeechRecognition.cpp b/dom/media/webspeech/recognition/SpeechRecognition.cpp
index dcde7e07879..a642cda4feb 100644
--- a/dom/media/webspeech/recognition/SpeechRecognition.cpp
+++ b/dom/media/webspeech/recognition/SpeechRecognition.cpp
@@ -713,6 +713,7 @@ SpeechRecognition::Start(const Optional<NonNull<DOMMediaStream>>& aStream, Error
   if (aStream.WasPassed()) {
     StartRecording(&aStream.Value());
   } else {
+    AutoNoJSAPI();
     MediaManager* manager = MediaManager::Get();
     manager->GetUserMedia(GetOwner(),
                           constraints,