From 369529f4c2bde6f9fa5b42812672fcd36d8d2d17 Mon Sep 17 00:00:00 2001
From: Kathy Brade <brade@pearlcrescent.com>
Date: Wed, 24 Jun 2015 11:01:11 -0400
Subject: [PATCH] Bug 16439: remove screencasting code.

Screencasting is disabled in desktop browsers because
browser.casting.enabled = false.  However, to avoid including
code that could lead to proxy bypass, we exclude the related
JS modules from Tor Browser.
---
 browser/modules/moz.build |  6 +++++-
 toolkit/modules/moz.build | 11 ++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index d713051982656..2526272249e8d 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -16,7 +16,6 @@ EXTRA_JS_MODULES += [
     'AttributionCode.jsm',
     'BrowserUITelemetry.jsm',
     'BrowserUsageTelemetry.jsm',
-    'CastingApps.jsm',
     'ContentClick.jsm',
     'ContentCrashHandlers.jsm',
     'ContentLinkHandler.jsm',
@@ -48,6 +47,11 @@ EXTRA_JS_MODULES += [
     'webrtcUI.jsm',
 ]
 
+if not CONFIG['TOR_BROWSER_VERSION']:
+    EXTRA_JS_MODULES += [
+        'CastingApps.jsm',
+    ]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXTRA_JS_MODULES += [
         'Windows8WindowFrameColor.jsm',
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 9e08fe9f0d29b..7944dbcd1e917 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -79,9 +79,6 @@ EXTRA_JS_MODULES += [
     'RemoteWebProgress.jsm',
     'ResetProfile.jsm',
     'ResponsivenessMonitor.jsm',
-    'secondscreen/PresentationApp.jsm',
-    'secondscreen/RokuApp.jsm',
-    'secondscreen/SimpleServiceDiscovery.jsm',
     'SelectContentHelper.jsm',
     'SelectParentHelper.jsm',
     'ServiceRequest.jsm',
@@ -102,6 +99,14 @@ EXTRA_JS_MODULES += [
     'WindowDraggingUtils.jsm',
     'ZipUtils.jsm',
 ]
+
+if not CONFIG['TOR_BROWSER_VERSION']:
+    EXTRA_JS_MODULES += [
+    'secondscreen/PresentationApp.jsm',
+    'secondscreen/RokuApp.jsm',
+    'secondscreen/SimpleServiceDiscovery.jsm',
+    ]
+
 EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
 EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
 
-- 
GitLab