Merge branch 'master' of git://github.com/mozilla/pdf.js.git into update-md5-2

Conflicts:
	test/test_manifest.json

test/driver.js

@@ -10,7 +10,7 @@
 // Disable worker support for running test as
 //   https://github.com/mozilla/pdf.js/pull/764#issuecomment-2638944
 //   "firefox-bin: Fatal IO error 12 (Cannot allocate memory) on X server :1."
-PDFJS.disableWorker = true;
+// PDFJS.disableWorker = true;
 
 var appPath, browser, canvas, currentTaskIdx, manifest, stdout;
 var inFlightRequests = 0;
@@ -100,13 +100,24 @@ function nextTask() {
 
   getPdf(task.file, function nextTaskGetPdf(data) {
     var failure;
+    function continuation() {
+      task.pageNum = task.firstPage || 1;
+      nextPage(task, failure);
+    }
     try {
-      task.pdfDoc = new PDFJS.PDFDoc(data);
+      var promise = PDFJS.getDocument(data);
+      promise.then(function(doc) {
+        task.pdfDoc = doc;
+        continuation();
+      }, function(e) {
+        failure = 'load PDF doc : ' + e;
+        continuation();
+      });
+      return;
     } catch (e) {
       failure = 'load PDF doc : ' + exceptionToString(e);
     }
-    task.pageNum = task.firstPage || 1;
-    nextPage(task, failure);
+    continuation();
   });
 }
 
@@ -163,45 +174,45 @@ function nextPage(task, loadError) {
       log(' loading page ' + task.pageNum + '/' + task.pdfDoc.numPages +
           '... ');
       var ctx = canvas.getContext('2d');
-      page = task.pdfDoc.getPage(task.pageNum);
+      task.pdfDoc.getPage(task.pageNum).then(function(page) {
+        var pdfToCssUnitsCoef = 96.0 / 72.0;
+        var viewport = page.getViewport(pdfToCssUnitsCoef);
+        canvas.width = viewport.width;
+        canvas.height = viewport.height;
+        clear(ctx);
 
-      var pdfToCssUnitsCoef = 96.0 / 72.0;
-      // using mediaBox for the canvas size
-      var pageWidth = page.width;
-      var pageHeight = page.height;
-      canvas.width = pageWidth * pdfToCssUnitsCoef;
-      canvas.height = pageHeight * pdfToCssUnitsCoef;
-      clear(ctx);
-
-      // using the text layer builder that does nothing to test
-      // text layer creation operations
-      var textLayerBuilder = {
-        beginLayout: function nullTextLayerBuilderBeginLayout() {},
-        endLayout: function nullTextLayerBuilderEndLayout() {},
-        appendText: function nullTextLayerBuilderAppendText(text, fontName,
-                                                            fontSize) {}
-      };
-
-      page.startRendering(
-        ctx,
-        function nextPageStartRendering(error) {
-          var failureMessage = false;
-          if (error)
-            failureMessage = 'render : ' + error.message;
-          snapshotCurrentPage(task, failureMessage);
+        // using the text layer builder that does nothing to test
+        // text layer creation operations
+        var textLayerBuilder = {
+          beginLayout: function nullTextLayerBuilderBeginLayout() {},
+          endLayout: function nullTextLayerBuilderEndLayout() {},
+          appendText: function nullTextLayerBuilderAppendText(text, fontName,
+                                                              fontSize) {}
+        };
+        var renderContext = {
+          canvasContext: ctx,
+          textLayer: textLayerBuilder,
+          viewport: viewport
+        };
+        var completeRender = (function(error) {
+          page.destroy();
+          snapshotCurrentPage(task, error);
+        });
+        page.render(renderContext).then(function() {
+          completeRender(false);
         },
-        textLayerBuilder
-      );
+        function(error) {
+          completeRender('render : ' + error);
+        });
+      },
+      function(error) {
+        snapshotCurrentPage(task, 'render : ' + error);
+      });
     } catch (e) {
       failure = 'page setup : ' + exceptionToString(e);
+      snapshotCurrentPage(task, failure);
     }
   }
-
-  if (failure) {
-    // Skip right to snapshotting if there was a failure, since the
-    // fonts might be in an inconsistent state.
-    snapshotCurrentPage(task, failure);
-  }
 }
 
 function snapshotCurrentPage(task, failure) {

test/pdfs/.gitignore

@@ -31,4 +31,5 @@
 !issue1002.pdf
 !issue925.pdf
 !gradientfill.pdf
-
+!basicapi.pdf
+!mixedfonts.pdf

test/test.py

@@ -16,6 +16,7 @@ BROWSERLOG_FILE = 'browser.log'
 REFDIR = 'ref'
 TMPDIR = 'tmp'
 VERBOSE = False
+BROWSER_TIMEOUT = 60
 
 SERVER_HOST = "localhost"
 
@@ -74,7 +75,7 @@ class State:
     browsers = [ ]
     manifest = { }
     taskResults = { }
-    remaining = 0
+    remaining = { }
     results = { }
     done = False
     numErrors = 0
@@ -83,6 +84,7 @@ class State:
     numFBFFailures = 0
     numLoadFailures = 0
     eqLog = None
+    lastPost = { }
 
 class Result:
     def __init__(self, snapshot, failure, page):
@@ -180,6 +182,7 @@ class PDFTestHandler(BaseHTTPRequestHandler):
 
         result = json.loads(self.rfile.read(numBytes))
         browser, id, failure, round, page, snapshot = result['browser'], result['id'], result['failure'], result['round'], result['page'], result['snapshot']
+        State.lastPost[browser] = int(time.time())
         taskResults = State.taskResults[browser][id]
         taskResults[round].append(Result(snapshot, failure, page))
 
@@ -199,9 +202,16 @@ class PDFTestHandler(BaseHTTPRequestHandler):
                   self.server.masterMode)
             # Please oh please GC this ...
             del State.taskResults[browser][id]
-            State.remaining -= 1
+            State.remaining[browser] -= 1
 
-        State.done = (0 == State.remaining)
+            checkIfDone()
+
+def checkIfDone():
+    State.done = True
+    for key in State.remaining:
+        if State.remaining[key] != 0:
+            State.done = False
+            return
 
 # Applescript hack to quit Chrome on Mac
 def tellAppToQuit(path, query):
@@ -376,6 +386,8 @@ def setUp(options):
 
     for b in testBrowsers:
         State.taskResults[b.name] = { }
+        State.remaining[b.name] = len(manifestList)
+        State.lastPost[b.name] = int(time.time())
         for item in manifestList:
             id, rounds = item['id'], int(item['rounds'])
             State.manifest[id] = item
@@ -384,8 +396,6 @@ def setUp(options):
                 taskResults.append([ ])
             State.taskResults[b.name][id] = taskResults
 
-    State.remaining = len(testBrowsers) * len(manifestList)
-
     return testBrowsers
 
 def startBrowsers(browsers, options):
@@ -568,6 +578,12 @@ def runTests(options, browsers):
     try:
         startBrowsers(browsers, options)
         while not State.done:
+            for b in State.lastPost:
+                if State.remaining[b] > 0 and int(time.time()) - State.lastPost[b] > BROWSER_TIMEOUT:
+                    print 'TEST-UNEXPECTED-FAIL | test failed', b, "has not responded in", BROWSER_TIMEOUT, "s"
+                    State.numErrors += State.remaining[b]
+                    State.remaining[b] = 0
+                    checkIfDone()
             time.sleep(1)
         processResults()
     finally:

test/test_manifest.json

@@ -29,6 +29,7 @@
        "file": "pdfs/pdf.pdf",
        "md5": "dbdb23c939d2be09b43126c3c56060c7",
        "link": true,
+       "pageLimit": 500,
        "rounds": 1,
        "type": "load"
     },
@@ -241,10 +242,10 @@
        "skipPages": [ 16 ],
        "type": "load"
     },
-    {  "id": "tcpdf_033",
-       "file": "pdfs/tcpdf_033.pdf",
-       "md5": "d7d9165a5e37029a67308a4dec3a8aeb",
-       "link": true,
+    {  "id": "mixedfonts",
+       "file": "pdfs/mixedfonts.pdf",
+       "md5": "a582b83fa1b3a25a6f13803a367c71ec",
+       "link": false,
        "rounds": 1,
        "type": "eq"
     },

test/test_slave.html

@@ -5,6 +5,7 @@
     <style type="text/css"></style>
     <script type="text/javascript" src="/src/core.js"></script>
     <script type="text/javascript" src="/src/util.js"></script>
+    <script type="text/javascript" src="/src/api.js"></script>
     <script type="text/javascript" src="/src/canvas.js"></script>
     <script type="text/javascript" src="/src/obj.js"></script>
     <script type="text/javascript" src="/src/function.js"></script>

test/unit/api_spec.js

@@ -0,0 +1,109 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+describe('api', function() {
+  // TODO run with worker enabled
+  PDFJS.disableWorker = true;
+  var basicApiUrl = '/basicapi.pdf';
+  function waitsForPromise(promise) {
+    waitsFor(function() {
+      return promise.isResolved || promise.isRejected;
+    }, 250);
+  }
+  function expectAfterPromise(promise, successCallback) {
+    waitsForPromise(promise);
+    runs(function() {
+      promise.then(successCallback,
+      function(error, e) {
+        // Shouldn't get here.
+        expect(false).toEqual(true);
+      });
+    });
+  }
+  describe('PDFJS', function() {
+    describe('getDocument', function() {
+      it('creates pdf doc from URL', function() {
+        console.log('what is');
+        debugger;
+        var promise = PDFJS.getDocument(basicApiUrl);
+        expectAfterPromise(promise, function(data) {
+          expect(true).toEqual(true);
+        });
+      });
+      /*
+      it('creates pdf doc from typed array', function() {
+        // TODO
+      });
+      */
+    });
+  });
+  describe('PDFDocument', function() {
+    var promise = PDFJS.getDocument(basicApiUrl);
+    waitsForPromise(promise);
+    var doc;
+    runs(function() {
+      promise.then(function(data) { doc = data; });
+    });
+    it('gets number of pages', function() {
+      expect(doc.numPages).toEqual(3);
+    });
+    it('gets fingerprint', function() {
+      expect(typeof doc.fingerprint).toEqual('string');
+    });
+    it('gets page', function() {
+      var promise = doc.getPage(1);
+      expectAfterPromise(promise, function(data) {
+        expect(true).toEqual(true);
+      });
+    });
+    it('gets destinations', function() {
+      var promise = doc.getDestinations();
+      expectAfterPromise(promise, function(data) {
+        // TODO this seems to be broken for the test pdf
+      });
+    });
+    it('gets outline', function() {
+      var promise = doc.getOutline();
+      expectAfterPromise(promise, function(outline) {
+        // Two top level entries.
+        expect(outline.length).toEqual(2);
+        // Make sure some basic attributes are set.
+        expect(outline[1].title).toEqual('Chapter 1');
+        expect(outline[1].items.length).toEqual(1);
+        expect(outline[1].items[0].title).toEqual('Paragraph 1.1');
+      });
+    });
+    it('gets metadata', function() {
+      var promise = doc.getMetadata();
+      expectAfterPromise(promise, function(metadata) {
+        expect(metadata.info['Title']).toEqual('Basic API Test');
+        expect(metadata.metadata.get('dc:title')).toEqual('Basic API Test');
+      });
+    });
+  });
+  describe('Page', function() {
+    var promise = new Promise();
+    PDFJS.getDocument(basicApiUrl).then(function(doc) {
+      doc.getPage(1).then(function(data) {
+        promise.resolve(data);
+      });
+    });
+    waitsForPromise(promise);
+    var page;
+    runs(function() {
+      promise.then(function(data) {
+        page = data;
+      });
+    });
+    it('gets ref', function() {
+      expect(page.ref).toEqual({num: 15, gen: 0});
+    });
+    // TODO rotate
+    // TODO viewport
+    // TODO annotaions
+    // TOOD text content
+    // TODO operation list
+  });
+});

test/unit/jsTestDriver.conf

@@ -1,32 +1,39 @@
 server: http://localhost:4224
 
-load:
-  - ../../external/jasmine/jasmine.js
-  - ../../external/jasmineAdapter/JasmineAdapter.js
-  - ../../src/obj.js
-  - ../../src/core.js
-  - ../../src/util.js
-  - ../../src/canvas.js
-  - ../../src/obj.js
-  - ../../src/function.js
-  - ../../src/charsets.js
-  - ../../src/cidmaps.js
-  - ../../src/colorspace.js
-  - ../../src/crypto.js
-  - ../../src/evaluator.js
-  - ../../src/fonts.js
-  - ../../src/glyphlist.js
-  - ../../src/image.js
-  - ../../src/metrics.js
-  - ../../src/parser.js
-  - ../../src/pattern.js
-  - ../../src/stream.js
-  - ../../src/worker.js
-  - ../../src/bidi.js
-  - ../../external/jpgjs/jpg.js
-  - ../unit/obj_spec.js
-  - ../unit/font_spec.js
-  - ../unit/function_spec.js
-  - ../unit/crypto_spec.js
-  - ../unit/stream_spec.js
+basepath: ..
 
+load:
+  - ../external/jasmine/jasmine.js
+  - ../external/jasmineAdapter/JasmineAdapter.js
+  - ../src/obj.js
+  - ../src/core.js
+  - ../src/util.js
+  - ../src/api.js
+  - ../src/canvas.js
+  - ../src/obj.js
+  - ../src/function.js
+  - ../src/charsets.js
+  - ../src/cidmaps.js
+  - ../src/colorspace.js
+  - ../src/crypto.js
+  - ../src/evaluator.js
+  - ../src/fonts.js
+  - ../src/glyphlist.js
+  - ../src/image.js
+  - ../src/metrics.js
+  - ../src/parser.js
+  - ../src/pattern.js
+  - ../src/stream.js
+  - ../src/worker.js
+  - ../src/bidi.js
+  - ../src/metadata.js
+  - ../external/jpgjs/jpg.js
+  - unit/obj_spec.js
+  - unit/font_spec.js
+  - unit/function_spec.js
+  - unit/crypto_spec.js
+  - unit/stream_spec.js
+  - unit/api_spec.js
+
+gateway:
+ - {matcher: "*.pdf", server: "http://localhost:8888/test/pdfs/"}