Bug 1226301. Remove Shumway from Fennec nightly builds. r=margaret

This commit is contained in:
Mike Taylor 2016-01-05 22:03:42 -06:00
parent 0710b041bf
commit d6c9217eae
4 changed files with 0 additions and 22 deletions

View File

@ -624,11 +624,6 @@ pref("media.mediasource.enabled", true);
// optimize images memory usage
pref("image.downscale-during-decode.enabled", true);
#ifdef NIGHTLY_BUILD
// Shumway component (SWF player) is disabled by default. Also see bug 904346.
pref("shumway.disabled", true);
#endif
#ifdef MOZ_SAFE_BROWSING
pref("browser.safebrowsing.enabled", true);
pref("browser.safebrowsing.malware.enabled", true);

View File

@ -93,11 +93,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "Profiler",
XPCOMUtils.defineLazyModuleGetter(this, "SimpleServiceDiscovery",
"resource://gre/modules/SimpleServiceDiscovery.jsm");
if (AppConstants.NIGHTLY_BUILD) {
XPCOMUtils.defineLazyModuleGetter(this, "ShumwayUtils",
"resource://shumway/ShumwayUtils.jsm");
}
XPCOMUtils.defineLazyModuleGetter(this, "WebappManager",
"resource://gre/modules/WebappManager.jsm");
@ -599,7 +594,6 @@ var BrowserApp = {
InitLater(() => Messaging.sendRequest({ type: "Gecko:DelayedStartup" }));
if (AppConstants.NIGHTLY_BUILD) {
InitLater(() => ShumwayUtils.init(), window, "ShumwayUtils");
InitLater(() => WebcompatReporter.init());
}

View File

@ -1,7 +0,0 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
JAR_MANIFESTS += ['../../../browser/extensions/shumway/jar.mn']

View File

@ -435,10 +435,6 @@
@BINPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
; [Browser Chrome Files]
#ifdef NIGHTLY_BUILD
@BINPATH@/chrome/shumway.manifest
@BINPATH@/chrome/shumway/*
#endif
@BINPATH@/chrome/toolkit@JAREXT@
@BINPATH@/chrome/toolkit.manifest