Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix setPreferences regression from the e10s patch (PR 5115)

Browse Source
This commit is contained in:
Jonas Jenwald 2014-09-18 01:14:00 +02:00
parent b97d2351aa
commit 3ac9bd063d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/firefox/content/PdfjsChromeUtils.jsm
View File

@ -1,3 +1,5 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
/* Copyright 2012 Mozilla Foundation /* Copyright 2012 Mozilla Foundation
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -23,7 +25,7 @@ const Ci = Components.interfaces;
const Cr = Components.results; const Cr = Components.results;
const Cu = Components.utils; const Cu = Components.utils;
const PREF_PREFIX = 'pdfjs'; const PREF_PREFIX = 'PDFJSSCRIPT_PREF_PREFIX';
const PDF_CONTENT_TYPE = 'application/pdf'; const PDF_CONTENT_TYPE = 'application/pdf';
Cu.import('resource://gre/modules/XPCOMUtils.jsm'); Cu.import('resource://gre/modules/XPCOMUtils.jsm');
@ -176,7 +178,9 @@ let PdfjsChromeUtils = {
}, },
_isPrefAllowed: function (aPrefName) { _isPrefAllowed: function (aPrefName) {
if (this._allowedPrefNames.indexOf(aPrefName) == -1) { let unPrefixedName = aPrefName.split(PREF_PREFIX + '.');
if (unPrefixedName[0] !== '' ||
this._allowedPrefNames.indexOf(unPrefixedName[1]) === -1) {
let msg = "'" + aPrefName + "' "; let msg = "'" + aPrefName + "' ";
msg += "can't be accessed from content. See PdfjsChromeUtils." msg += "can't be accessed from content. See PdfjsChromeUtils."
throw new Error(msg); throw new Error(msg);

4
make.js
View File

@ -680,6 +680,8 @@ target.firefox = function() {
FIREFOX_BUILD_CONTENT_DIR + 'PdfStreamConverter.jsm'); FIREFOX_BUILD_CONTENT_DIR + 'PdfStreamConverter.jsm');
sed('-i', /PDFJSSCRIPT_MOZ_CENTRAL/, 'false', sed('-i', /PDFJSSCRIPT_MOZ_CENTRAL/, 'false',
FIREFOX_BUILD_CONTENT_DIR + 'PdfStreamConverter.jsm'); FIREFOX_BUILD_CONTENT_DIR + 'PdfStreamConverter.jsm');
sed('-i', /PDFJSSCRIPT_PREF_PREFIX/, FIREFOX_PREF_PREFIX,
FIREFOX_BUILD_CONTENT_DIR + 'PdfjsChromeUtils.jsm');
// Update localized metadata // Update localized metadata
var localizedMetadata = cat(EXTENSION_SRC_DIR + '/firefox/metadata.inc'); var localizedMetadata = cat(EXTENSION_SRC_DIR + '/firefox/metadata.inc');
@ -808,6 +810,8 @@ target.mozcentral = function() {
MOZCENTRAL_CONTENT_DIR + 'PdfStreamConverter.jsm'); MOZCENTRAL_CONTENT_DIR + 'PdfStreamConverter.jsm');
sed('-i', /PDFJSSCRIPT_MOZ_CENTRAL/, 'true', sed('-i', /PDFJSSCRIPT_MOZ_CENTRAL/, 'true',
MOZCENTRAL_CONTENT_DIR + 'PdfStreamConverter.jsm'); MOZCENTRAL_CONTENT_DIR + 'PdfStreamConverter.jsm');
sed('-i', /PDFJSSCRIPT_PREF_PREFIX/, MOZCENTRAL_PREF_PREFIX,
MOZCENTRAL_CONTENT_DIR + 'PdfjsChromeUtils.jsm');
// Copy test files // Copy test files
mkdir('-p', MOZCENTRAL_TEST_DIR); mkdir('-p', MOZCENTRAL_TEST_DIR);