Bug 773397: Disable pdf.js in beta 15 build, r=gavin, a=gavin
authorBrendan Dahl <bdahl@mozilla.com>
Fri, 27 Jul 2012 10:49:27 -0700
changeset 100518 aff8c2ba16dd
parent 100517 123f0b08a7ac
child 100519 77248c613062
push id1284
push usergsharp@mozilla.com
push dateTue, 14 Aug 2012 21:38:10 +0000
treeherdermozilla-beta@aff8c2ba16dd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin, gavin
bugs773397
milestone15.0
Bug 773397: Disable pdf.js in beta 15 build, r=gavin, a=gavin
browser/app/profile/firefox.js
browser/extensions/Makefile.in
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1157,17 +1157,17 @@ pref("full-screen-api.approval-required"
 // Startup Crash Tracking
 // number of startup crashes that can occur before starting into safe mode automatically
 // (this pref has no effect if more than 6 hours have passed since the last crash)
 pref("toolkit.startup.max_resumed_crashes", 3);
 
 // Completely disable pdf.js as an option to preview pdfs within firefox.
 // Note: if this is not disabled it does not necessarily mean pdf.js is the pdf
 // handler just that it is an option.
-pref("pdfjs.disabled", false);
+pref("pdfjs.disabled", true);
 // Used by pdf.js to know the first time firefox is run with it installed so it
 // can become the default pdf viewer.
 pref("pdfjs.firstRun", true);
 // The values of preferredAction and alwaysAskBeforeHandling before pdf.js
 // became the default.
 pref("pdfjs.previousHandler.preferredAction", 0);
 pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
 
--- a/browser/extensions/Makefile.in
+++ b/browser/extensions/Makefile.in
@@ -6,17 +6,18 @@ DEPTH      = ../..
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 CHROMEDIR = $(call core_abspath,$(DIST))/bin/chrome
 
 include $(DEPTH)/config/autoconf.mk
 
-TEST_DIRS += pdfjs/test
+# Disabled on beta because we're disabling PDF.js support
+#TEST_DIRS += pdfjs/test
 
 include $(topsrcdir)/config/rules.mk
 
 exclude_files = \
   test \
   install.rdf \
   bootstrap.js \
   icon.png \