Bug 1130059 - Enable Shumway by default in Nightly on OS X and Windows Vista+ for whitelisted SWFs. r=gavin

--HG--
extra : rebase_source : da3669a8ce6a71aab372b5c68ad4d64a0344f170
This commit is contained in:
Till Schneidereit 2015-02-10 19:01:06 +01:00
parent 29ef9cda7c
commit 3ecbb0d547

View File

@ -1651,9 +1651,15 @@ pref("pdfjs.firstRun", true);
pref("pdfjs.previousHandler.preferredAction", 0);
pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
// Shumway is only bundled in Nightly.
#ifdef NIGHTLY_BUILD
// Shumway component (SWF player) is disabled by default. Also see bug 904346.
// By default, Shumway (SWF player) is only enabled for whitelisted SWFs on Windows + OS X.
#ifdef UNIX_BUT_NOT_MAC
pref("shumway.disabled", true);
#else
pref("shumway.disabled", false);
pref("shumway.swf.whitelist", "http://g-ecx.images-amazon.com/*/AiryBasicRenderer*.swf");
#endif
#endif
// The maximum amount of decoded image data we'll willingly keep around (we