Backed out changeset f884a597f402 (bug 1338395) for timing out in browser_pdfjs_main.js, at least on Linux with e10s. r=backout

browser/extensions/pdfjs/README.mozilla

@@ -1,3 +1,3 @@
 This is the pdf.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 1.7.278
+Current extension version is: 1.7.242

browser/extensions/pdfjs/content/PdfJs.jsm

@@ -94,7 +94,6 @@ function initializeDefaultPreferences() {
   "enhanceTextSelection": false,
   "renderer": "canvas",
   "renderInteractiveForms": false,
-  "enablePrintAutoRotate": false,
   "disablePageLabels": false
 }
 

browser/extensions/pdfjs/content/PdfStreamConverter.jsm

@@ -23,7 +23,8 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
-
+// True only if this is the version of pdf.js that is included with firefox.
+const MOZ_CENTRAL = JSON.parse("true");
 const PDFJS_EVENT_ID = "pdf.js.message";
 const PDF_CONTENT_TYPE = "application/pdf";
 const PREF_PREFIX = "pdfjs";

browser/extensions/pdfjs/content/PdfjsChromeUtils.jsm

@@ -52,7 +52,6 @@ var DEFAULT_PREFERENCES =
   "enhanceTextSelection": false,
   "renderer": "canvas",
   "renderInteractiveForms": false,
-  "enablePrintAutoRotate": false,
   "disablePageLabels": false
 }
 

browser/extensions/pdfjs/content/pdfjschildbootstrap.js

@@ -0,0 +1,35 @@
+/* Copyright 2014 Mozilla Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/* globals Components, PdfjsContentUtils, PdfJs, Services */
+
+"use strict";
+
+/*
+ * pdfjschildbootstrap.js loads into the content process to take care of
+ * initializing our built-in version of pdfjs when running remote.
+ */
+
+Components.utils.import("resource://gre/modules/Services.jsm");
+Components.utils.import("resource://pdf.js/PdfJs.jsm");
+Components.utils.import("resource://pdf.js/PdfjsContentUtils.jsm");
+
+// init content utils shim pdfjs will use to access privileged apis.
+PdfjsContentUtils.init();
+
+if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) {
+  // register various pdfjs factories that hook us into content loading.
+  PdfJs.updateRegistration();
+}
+

browser/extensions/pdfjs/content/web/debugger.js

@@ -387,9 +387,7 @@ var Stepper = (function StepperClosure() {
       this.table.appendChild(chunk);
     },
     getNextBreakPoint: function getNextBreakPoint() {
-      this.breakPoints.sort(function(a, b) {
-        return a - b;
-      });
+      this.breakPoints.sort(function(a, b) { return a - b; });
       for (var i = 0; i < this.breakPoints.length; i++) {
         if (this.breakPoints[i] > this.currentIdx) {
           return this.breakPoints[i];
@@ -486,9 +484,7 @@ var Stats = (function Stats() {
       wrapper.appendChild(title);
       wrapper.appendChild(statsDiv);
       stats.push({ pageNumber: pageNumber, div: wrapper });
-      stats.sort(function(a, b) {
-        return a.pageNumber - b.pageNumber;
-      });
+      stats.sort(function(a, b) { return a.pageNumber - b.pageNumber; });
       clear(this.panel);
       for (var i = 0, ii = stats.length; i < ii; ++i) {
         this.panel.appendChild(stats[i].div);