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

Remove TODO on PDFDocModel and rename pdf to pdfModel

Browse Source
This commit is contained in:
Julian Viereck 2012-02-21 14:10:44 +01:00
parent 889d6d100a
commit c57349a927
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core.js
View File

@ -473,9 +473,6 @@ var Page = (function PageClosure() {
* Right now there exists one PDFDocModel on the main thread + one object * Right now there exists one PDFDocModel on the main thread + one object
* for each worker. If there is no worker support enabled, there are two * for each worker. If there is no worker support enabled, there are two
* `PDFDocModel` objects on the main thread created. * `PDFDocModel` objects on the main thread created.
* TODO: Refactor the internal object structure, such that there is no
* need for the `PDFDocModel` anymore and there is only one object on the
* main thread and not one entire copy on each worker instance.
*/ */
var PDFDocModel = (function PDFDocModelClosure() { var PDFDocModel = (function PDFDocModelClosure() {
function PDFDocModel(arg, callback) { function PDFDocModel(arg, callback) {
@ -644,9 +641,9 @@ var PDFDoc = (function PDFDocClosure() {
this.data = data; this.data = data;
this.stream = stream; this.stream = stream;
this.pdf = new PDFDocModel(stream); this.pdfModel = new PDFDocModel(stream);
this.fingerprint = this.pdf.getFingerprint(); this.fingerprint = this.pdfModel.getFingerprint();
this.catalog = this.pdf.catalog; this.catalog = this.pdfModel.catalog;
this.objs = new PDFObjects(); this.objs = new PDFObjects();
this.pageCache = []; this.pageCache = [];
@ -820,7 +817,7 @@ var PDFDoc = (function PDFDocClosure() {
}, },
get numPages() { get numPages() {
return this.pdf.numPages; return this.pdfModel.numPages;
}, },
startRendering: function pdfDocStartRendering(page) { startRendering: function pdfDocStartRendering(page) {
@ -835,7 +832,7 @@ var PDFDoc = (function PDFDocClosure() {
if (this.pageCache[n]) if (this.pageCache[n])
return this.pageCache[n]; return this.pageCache[n];
var page = this.pdf.getPage(n); var page = this.pdfModel.getPage(n);
// Add a reference to the objects such that Page can forward the reference // Add a reference to the objects such that Page can forward the reference
// to the CanvasGraphics and so on. // to the CanvasGraphics and so on.
page.objs = this.objs; page.objs = this.objs;

6
src/worker.js
View File

@ -79,7 +79,7 @@ MessageHandler.prototype = {
var WorkerMessageHandler = { var WorkerMessageHandler = {
setup: function wphSetup(handler) { setup: function wphSetup(handler) {
var pdfDoc = null; var pdfModel = null;
handler.on('test', function wphSetupTest(data) { handler.on('test', function wphSetupTest(data) {
handler.send('test', data instanceof Uint8Array); handler.send('test', data instanceof Uint8Array);
@ -88,7 +88,7 @@ var WorkerMessageHandler = {
handler.on('doc', function wphSetupDoc(data) { handler.on('doc', function wphSetupDoc(data) {
// Create only the model of the PDFDoc, which is enough for // Create only the model of the PDFDoc, which is enough for
// processing the content of the pdf. // processing the content of the pdf.
pdfDoc = new PDFDocModel(new Stream(data)); pdfModel = new PDFDocModel(new Stream(data));
}); });
handler.on('page_request', function wphSetupPageRequest(pageNum) { handler.on('page_request', function wphSetupPageRequest(pageNum) {
@ -105,7 +105,7 @@ var WorkerMessageHandler = {
var dependency = []; var dependency = [];
var IRQueue = null; var IRQueue = null;
try { try {
var page = pdfDoc.getPage(pageNum); var page = pdfModel.getPage(pageNum);
// Pre compile the pdf page and fetch the fonts/images. // Pre compile the pdf page and fetch the fonts/images.
IRQueue = page.getIRQueue(handler, dependency); IRQueue = page.getIRQueue(handler, dependency);
} catch (e) { } catch (e) {