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

Remove DOM window URI check

Browse Source 
Per discussion in #2937
This commit is contained in:
Simon Kornblith 2013-04-24 21:02:33 -04:00
parent f93582a26d
commit f524eaefe2
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
extensions/firefox/components/PdfStreamConverter.js
View File

@ -765,33 +765,28 @@ PdfStreamConverter.prototype = {
// We get the DOM window here instead of before the request since it // We get the DOM window here instead of before the request since it
// may have changed during a redirect. // may have changed during a redirect.
var domWindow = getDOMWindow(channel); var domWindow = getDOMWindow(channel);
// Double check the url is still the correct one. var actions;
if (domWindow.document.documentURIObject.equals(aRequest.URI)) { if (rangeRequest) {
var actions; // We are going to be issuing range requests, so cancel the
if (rangeRequest) { // original request
// We are going to be issuing range requests, so cancel the aRequest.resume();
// original request aRequest.cancel(Cr.NS_BINDING_ABORTED);
aRequest.resume(); actions = new RangedChromeActions(domWindow,
aRequest.cancel(Cr.NS_BINDING_ABORTED); contentDispositionFilename, aRequest);
actions = new RangedChromeActions(domWindow,
contentDispositionFilename, aRequest);
} else {
actions = new StandardChromeActions(
domWindow, contentDispositionFilename, dataListener);
}
var requestListener = new RequestListener(actions);
domWindow.addEventListener(PDFJS_EVENT_ID, function(event) {
requestListener.receive(event);
}, false, true);
if (actions.supportsIntegratedFind()) {
var chromeWindow = getChromeWindow(domWindow);
var findEventManager = new FindEventManager(chromeWindow.gFindBar,
domWindow,
chromeWindow);
findEventManager.bind();
}
} else { } else {
log('Dom window url did not match request url.'); actions = new StandardChromeActions(
domWindow, contentDispositionFilename, dataListener);
}
var requestListener = new RequestListener(actions);
domWindow.addEventListener(PDFJS_EVENT_ID, function(event) {
requestListener.receive(event);
}, false, true);
if (actions.supportsIntegratedFind()) {
var chromeWindow = getChromeWindow(domWindow);
var findEventManager = new FindEventManager(chromeWindow.gFindBar,
domWindow,
chromeWindow);
findEventManager.bind();
} }
listener.onStopRequest(aRequest, context, statusCode); listener.onStopRequest(aRequest, context, statusCode);
} }