merge upstream

diff --cc extensions/firefox/components/PdfStreamConverter.js
index f866a6b2fd77630d33b24fef4c2205a50556c00d,2e7ab56e86719665cbd37caf74d881e592241f39..532075bed01228b3f098e4a114f965e6c421b95c
--- 1/extensions/firefox/components/PdfStreamConverter.js
--- 2/extensions/firefox/components/PdfStreamConverter.js
+++ b/extensions/firefox/components/PdfStreamConverter.js
@@@ -160,10 -167,28 +167,31 @@@ ChromeActions.prototype = 
      }
    },
    pdfBugEnabled: function() {
 -    return getBoolPref(PREF_PREFIX + '.pdfBugEnabled', false);
 +    return getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false);
 +  },
 +  searchEnabled: function() {
 +    return getBoolPref(EXT_PREFIX + '.searchEnabled', false);
+   },
+   fallback: function(url) {
+     var self = this;
+     var domWindow = this.domWindow;
+     var strings = getLocalizedStrings('chrome.properties');
+     var message = getLocalizedString(strings, 'unsupported_feature');
+ 
+     var win = Services.wm.getMostRecentWindow('navigator:browser');
+     var browser = win.gBrowser.getBrowserForDocument(domWindow.top.document);
+     var notificationBox = win.gBrowser.getNotificationBox(browser);
+ 
+     var buttons = [{
+       label: getLocalizedString(strings, 'open_with_different_viewer'),
+       accessKey: null,
+       callback: function() {
+         self.download(url);
+       }
+     }];
+     notificationBox.appendNotification(message, 'pdfjs-fallback', null,
+                                        notificationBox.PRIORITY_WARNING_LOW,
+                                        buttons);
    }
  };
  

diff --cc src/api.js
Simple merge

diff --cc src/core.js
Simple merge

diff --cc src/evaluator.js
Simple merge

diff --cc src/fonts.js
Simple merge

diff --cc src/worker.js
Simple merge

diff --cc web/viewer.css
Simple merge

diff --cc web/viewer.html
Simple merge

diff --cc web/viewer.js
index b9407305df77ce8899509be74c817d178d98cfc9,2b906771954538032a6c8bc70d274bc1e1768fd5..e6d1b6766950e83ee45c86d860c33606dd34c66d
--- 1/web/viewer.js
--- 2/web/viewer.js
+++ b/web/viewer.js
@@@ -219,10 -219,9 +219,11 @@@ var PDFView = 
    currentScale: kUnknownScale,
    currentScaleValue: null,
    initialBookmark: document.location.hash.substring(1),
 +  startedTextExtraction: false,
 +  pageText: [],
    container: null,
    initialized: false,
+   fellback: false,
    // called once when the document is loaded
    initialize: function pdfViewInitialize() {
      this.container = document.getElementById('viewerContainer');
@@@ -1490,11 -1418,14 +1527,19 @@@ window.addEventListener('load', functio
      PDFBug.init();
    }
  
 +  if (!PDFJS.isFirefoxExtension ||
 +    (PDFJS.isFirefoxExtension && FirefoxCom.request('searchEnabled'))) {
 +    document.querySelector('#viewSearch').classList.remove('hidden');
 +  }
 +
+   // Listen for warnings to trigger the fallback UI.  Errors should be caught
+   // and call PDFView.error() so we don't need to listen for those.
+   PDFJS.LogManager.addLogger({
+     warn: function() {
+       PDFView.fallback();
+     }
+   });
+ 
    var thumbsView = document.getElementById('thumbnailView');
    thumbsView.addEventListener('scroll', updateThumbViewArea, true);