Remove useless code since the extension is loaded into a privileged chrome:// scope

diff --git a/extensions/firefox/components/pdfContentHandler.js b/extensions/firefox/components/pdfContentHandler.js
index 9186bfd8ad2e0e64144895f1caa111d432813eda..eda0ec92c73509c9953262479453aff48840f434 100644 (file)
--- a/extensions/firefox/components/pdfContentHandler.js
+++ b/extensions/firefox/components/pdfContentHandler.js
@@ -20,105 +20,6 @@ function log(aMsg) {
   dump(msg + '\n');
 }
 
-function fireEventTo(aName, aData, aWindow) {
-  let window = aWindow.wrappedJSObject;
-  let evt = window.document.createEvent('CustomEvent');
-  evt.initCustomEvent('pdf' + aName, false, false, aData);
-  window.document.dispatchEvent(evt);
-}
-
-function loadDocument(aWindow, aDocumentUrl) {
-  let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1']
-              .createInstance(Ci.nsIXMLHttpRequest);
-  xhr.onprogress = function updateProgress(evt) {
-    if (evt.lengthComputable)
-      fireEventTo(evt.type, evt.loaded / evt.total, aWindow);
-  };
-
-  xhr.onerror = function error(evt) {
-    fireEventTo(evt.type, false, aWindow);
-  };
-
-  xhr.onload = function load(evt) {
-    let data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
-                xhr.responseArrayBuffer || xhr.response);
-    try {
-      let view = new Uint8Array(data);
-
-      let window = aWindow.wrappedJSObject;
-      let arrayBuffer = new window.ArrayBuffer(data.byteLength);
-      let view2 = new window.Uint8Array(arrayBuffer);
-      view2.set(view);
-
-      fireEventTo(evt.type, arrayBuffer, aWindow);
-    } catch (e) {
-      log('Error - ' + e);
-    }
-  };
-
-  xhr.open('GET', aDocumentUrl);
-  xhr.responseType = 'arraybuffer';
-  xhr.send(null);
-}
-
-let WebProgressListener = {
-  init: function WebProgressListenerInit(aWindow, aUrl) {
-    this._locationHasChanged = false;
-    this._documentUrl = aUrl;
-
-    let flags = Ci.nsIWebProgress.NOTIFY_LOCATION |
-                Ci.nsIWebProgress.NOTIFY_STATE_NETWORK |
-                Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT;
-
-    let docShell = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                          .getInterface(Ci.nsIWebNavigation)
-                          .QueryInterface(Ci.nsIDocShell);
-    let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                              .getInterface(Ci.nsIWebProgress);
-    try {
-      webProgress.removeProgressListener(this);
-    } catch (e) {}
-    webProgress.addProgressListener(this, flags);
-  },
-
-  onStateChange: function onStateChange(aWebProgress, aRequest, aStateFlags,
-                                        aStatus) {
-    const complete = Ci.nsIWebProgressListener.STATE_IS_WINDOW +
-                     Ci.nsIWebProgressListener.STATE_STOP;
-    if ((aStateFlags & complete) == complete && this._locationHasChanged) {
-      aWebProgress.removeProgressListener(this);
-      loadDocument(aWebProgress.DOMWindow, this._documentUrl);
-    }
-  },
-
-  onProgressChange: function onProgressChange(aWebProgress, aRequest, aCurSelf,
-                                              aMaxSelf, aCurTotal, aMaxTotal) {
-  },
-
-  onLocationChange: function onLocationChange(aWebProgress, aRequest,
-                                              aLocationURI) {
-    this._locationHasChanged = true;
-  },
-
-  onStatusChange: function onStatusChange(aWebProgress, aRequest, aStatus,
-                                          aMessage) {
-  },
-
-  onSecurityChange: function onSecurityChange(aWebProgress, aRequest, aState) {
-  },
-
-  QueryInterface: function QueryInterface(aIID) {
-    if (aIID.equals(Ci.nsIWebProgressListener) ||
-        aIID.equals(Ci.nsISupportsWeakReference) ||
-        aIID.equals(Ci.nsISupports)) {
-        return this;
-    }
-
-    throw Components.results.NS_ERROR_NO_INTERFACE;
-  }
-};
-
-
 function pdfContentHandler() {
 }
 
@@ -139,12 +40,11 @@ pdfContentHandler.prototype = {
     aRequest.cancel(Cr.NS_BINDING_ABORTED);
     let uri = aRequest.URI;
 
-    window = callbacks.getInterface(Ci.nsIDOMWindow);
-    WebProgressListener.init(window, uri.spec);
-
     try {
       let url = Services.prefs.getCharPref('extensions.pdf.js.url');
       url = url.replace('%s', uri.spec);
+
+      window = callbacks.getInterface(Ci.nsIDOMWindow);
       window.location = url;
     } catch (e) {
       log('Error retrieving the pdf.js base url - ' + e);
@@ -157,4 +57,3 @@ pdfContentHandler.prototype = {
 
 var NSGetFactory = XPCOMUtils.generateNSGetFactory([pdfContentHandler]);
 
-

diff --git a/web/viewer.js b/web/viewer.js
index 91562baf44d2145bbf90e58509497559574ba79f..4008d58e1c2da94ba00e4188067f89810b7cfb2f 100644 (file)
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -108,9 +108,6 @@ var PDFView = {
   },
 
   open: function pdfViewOpen(url, scale) {
-    if (url.indexOf('http') == 0)
-      return;
-
     document.title = url;
 
     getPdf(
@@ -555,18 +552,6 @@ window.addEventListener('load', function webViewerLoad(evt) {
     document.getElementById('fileInput').value = null;
 }, true);
 
-window.addEventListener('pdfload', function webViewerPdfload(evt) {
-  PDFView.load(evt.detail);
-}, true);
-
-window.addEventListener('pdfprogress', function webViewerPdfProgress(evt) {
-  PDFView.progress(evt.detail);
-}, true);
-
-window.addEventListener('pdferror', function webViewerPdfError(evt) {
-  PDFView.error();
-}, true);
-
 function updateViewarea() {
   var visiblePages = PDFView.getVisiblePages();
   for (var i = 0; i < visiblePages.length; i++) {