Merge with upstream

This commit is contained in:
Vivien Nicolas 2011-07-11 13:49:26 +02:00
commit 068bfa0bfe
37 changed files with 7857 additions and 6844 deletions

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
*~
pdf.pdf pdf.pdf
intelisa.pdf intelisa.pdf
openweb_tm-PRINT.pdf openweb_tm-PRINT.pdf
local.mk

163
Makefile Normal file
View File

@ -0,0 +1,163 @@
REPO = git@github.com:andreasgal/pdf.js.git
BUILD_DIR := build
DEFAULT_BROWSERS := resources/browser_manifests/browser_manifest.json
DEFAULT_TESTS := test_manifest.json
# Let folks define custom rules for their clones.
-include local.mk
# JS files needed for pdf.js.
# This list doesn't account for the 'worker' directory.
PDF_JS_FILES = \
pdf.js \
crypto.js \
fonts.js \
glyphlist.js \
$(NULL)
# not sure what to do for all yet
all: help
# make server
#
# This target starts a local web server at localhost:8888. This can be
# used for testing all browsers.
server:
@cd test; python test.py --port=8888;
test: shell-test browser-test
# make browser-test
#
# This target runs in-browser tests using two primary arguments: a
# test manifest file, and a browser manifest file. Both are simple
# JSON formats, and examples can be found in the test/ directory. The
# target will inspect the environment for the PDF_TESTS and
# PDF_BROWSERS variables, and use those if found. Otherwise, the
# defaults at the top of this file are used.
ifeq ($(PDF_TESTS),)
PDF_TESTS := $(DEFAULT_TESTS)
endif
ifeq ($(PDF_BROWSERS),)
PDF_BROWSERS := $(DEFAULT_BROWSERS)
endif
browser-test:
@if [ ! -f "test/$(PDF_BROWSERS)" ]; then \
echo "Browser manifest file $(PDF_BROWSERS) does not exist."; \
echo "Try copying one of the examples" \
"in test/resources/browser_manifests/"; \
exit 1; \
fi;
cd test; \
python test.py --reftest \
--browserManifestFile=$(PDF_BROWSERS) \
--manifestFile=$(PDF_TESTS)
# make shell-test
#
# This target runs all of the tests that can be run in a JS shell.
# The shell used is taken from the JS_SHELL environment variable. If
# that variable is not defined, the script will attempt to use the copy
# of Rhino that comes with the Closure compiler used for producing the
# website.
SHELL_TARGET = $(NULL)
ifeq ($(JS_SHELL),)
JS_SHELL := "java -cp $(BUILD_DIR)/compiler.jar"
JS_SHELL += "com.google.javascript.jscomp.mozilla.rhino.tools.shell.Main"
SHELL_TARGET = compiler
endif
shell-test: shell-msg $(SHELL_TARGET) font-test
shell-msg:
ifeq ($(SHELL_TARGET), compiler)
@echo "No JS_SHELL env variable present."
@echo "The default is to find a copy of Rhino and try that."
endif
@echo "JS shell command is: $(JS_SHELL)"
font-test:
@echo "font test stub."
# make lint
#
# This target runs the Closure Linter on most of our JS files.
# To install gjslint, see:
#
# <http://code.google.com/closure/utilities/docs/linter_howto.html>
SRC_DIRS := . utils worker web
GJSLINT_FILES = $(foreach DIR,$(SRC_DIRS),$(wildcard $(DIR)/*.js))
lint:
gjslint $(GJSLINT_FILES)
# make web
#
# This target produces the website for the project, by checking out
# the gh-pages branch underneath the build directory, and then move
# the various viewer files into place.
#
# TODO: Use the Closure compiler to optimize the pdf.js files.
#
GH_PAGES = $(BUILD_DIR)/gh-pages
web: | compiler pages-repo \
$(addprefix $(GH_PAGES)/, $(PDF_JS_FILES)) \
$(addprefix $(GH_PAGES)/, $(wildcard web/*.*)) \
$(addprefix $(GH_PAGES)/, $(wildcard web/images/*.*))
@cp $(GH_PAGES)/web/index.html.template $(GH_PAGES)/index.html;
@cd $(GH_PAGES); git add -A;
@echo "Website built in $(GH_PAGES)."
# make pages-repo
#
# This target clones the gh-pages repo into the build directory. It
# deletes the current contents of the repo, since we overwrite
# everything with data from the master repo. The 'make web' target
# then uses 'git add -A' to track additions, modifications, moves,
# and deletions.
pages-repo: | $(BUILD_DIR)
@if [ ! -d "$(GH_PAGES)" ]; then \
git clone -b gh-pages $(REPO) $(GH_PAGES); \
rm -rf $(GH_PAGES)/*; \
fi;
@mkdir -p $(GH_PAGES)/web;
@mkdir -p $(GH_PAGES)/web/images;
$(GH_PAGES)/%.js: %.js
@cp $< $@
$(GH_PAGES)/web/%: web/%
@cp $< $@
$(GH_PAGES)/web/images/%: web/images/%
@cp $< $@
# make compiler
#
# This target downloads the Closure compiler, and places it in the
# build directory. This target is also useful when the user doesn't
# have a JS shell available--we can have them use the Rhino shell that
# comes with Closure.
COMPILER_URL = http://closure-compiler.googlecode.com/files/compiler-latest.zip
compiler: $(BUILD_DIR)/compiler.zip
$(BUILD_DIR)/compiler.zip: | $(BUILD_DIR)
curl $(COMPILER_URL) > $(BUILD_DIR)/compiler.zip;
cd $(BUILD_DIR); unzip compiler.zip compiler.jar;
# Make sure there's a build directory.
$(BUILD_DIR):
mkdir -p $(BUILD_DIR)
clean:
rm -rf $(BUILD_DIR)
# make help
#
# This target just prints out a message to read these comments. :)
help:
@echo "Read the comments in the Makefile for guidance.";
.PHONY:: all test browser-test font-test shell-test \
shell-msg lint clean web compiler help server

View File

@ -1,7 +1,7 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- / /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
"use strict"; 'use strict';
var ARCFourCipher = (function() { var ARCFourCipher = (function() {
function constructor(key) { function constructor(key) {
@ -30,7 +30,7 @@ var ARCFourCipher = (function() {
a = (a + 1) & 0xFF; a = (a + 1) & 0xFF;
tmp = s[a]; tmp = s[a];
b = (b + tmp) & 0xFF; b = (b + tmp) & 0xFF;
tmp2 = s[b] tmp2 = s[b];
s[a] = tmp2; s[a] = tmp2;
s[b] = tmp; s[b] = tmp;
output[i] = data[i] ^ s[(tmp + tmp2) & 0xFF]; output[i] = data[i] ^ s[(tmp + tmp2) & 0xFF];
@ -50,18 +50,19 @@ var md5 = (function() {
5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]); 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
var k = new Int32Array([ var k = new Int32Array([
-680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426, -680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426,
-1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162, -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162,
1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632, 1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632,
643717713, -373897302, -701558691, 38016083, -660478335, -405537848, 568446438, 643717713, -373897302, -701558691, 38016083, -660478335, -405537848,
-1019803690, -187363961, 1163531501, -1444681467, -51403784, 1735328473, 568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784,
-1926607734, -378558, -2022574463, 1839030562, -35309556, -1530992060, 1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556,
1272893353, -155497632, -1094730640, 681279174, -358537222, -722521979, -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222,
76029189, -640364487, -421815835, 530742520, -995338651, -198630844, 1126891415, -722521979, 76029189, -640364487, -421815835, 530742520, -995338651,
-1416354905, -57434055, 1700485571, -1894986606, -1051523, -2054922799, -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606,
1873313359, -30611744, -1560198380, 1309151649, -145523070, -1120210379, -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649,
718787259, -343485551]); -145523070, -1120210379, 718787259, -343485551]);
function hash(data, offset, length) { function hash(data, offset, length) {
var h0 = 1732584193, h1 = -271733879, h2 = -1732584194, h3 = 271733878; var h0 = 1732584193, h1 = -271733879, h2 = -1732584194, h3 = 271733878;
@ -87,8 +88,10 @@ var md5 = (function() {
// TODO ArrayBuffer ? // TODO ArrayBuffer ?
var w = new Int32Array(16); var w = new Int32Array(16);
for (i = 0; i < paddedLength;) { for (i = 0; i < paddedLength;) {
for (j = 0; j < 16; ++j, i += 4) for (j = 0; j < 16; ++j, i += 4) {
w[j] = padded[i] | (padded[i + 1] << 8) | (padded[i + 2] << 16) | (padded[i + 3] << 24); w[j] = (padded[i] | (padded[i + 1] << 8) |
(padded[i + 2] << 16) | (padded[i + 3] << 24));
}
var a = h0, b = h1, c = h2, d = h3, f, g; var a = h0, b = h1, c = h2, d = h3, f, g;
for (j = 0; j < 64; ++j) { for (j = 0; j < 64; ++j) {
if (j < 16) { if (j < 16) {
@ -131,7 +134,7 @@ var CipherTransform = (function() {
this.streamCipherConstructor = streamCipherConstructor; this.streamCipherConstructor = streamCipherConstructor;
} }
constructor.prototype = { constructor.prototype = {
createStream: function (stream) { createStream: function(stream) {
var cipher = new this.streamCipherConstructor(); var cipher = new this.streamCipherConstructor();
return new DecryptStream(stream, function(data) { return new DecryptStream(stream, function(data) {
return cipher.encryptBlock(data); return cipher.encryptBlock(data);
@ -139,19 +142,22 @@ var CipherTransform = (function() {
}, },
decryptString: function(s) { decryptString: function(s) {
var cipher = new this.stringCipherConstructor(); var cipher = new this.stringCipherConstructor();
var data = string2bytes(s); var data = stringToBytes(s);
data = cipher.encryptBlock(data); data = cipher.encryptBlock(data);
return bytes2string(data); return bytesToString(data);
} }
}; };
return constructor; return constructor;
})(); })();
var CipherTransformFactory = (function() { var CipherTransformFactory = (function() {
function prepareKeyData(fileId, password, ownerPassword, userPassword, flags, revision, keyLength) { function prepareKeyData(fileId, password, ownerPassword, userPassword,
flags, revision, keyLength) {
var defaultPasswordBytes = new Uint8Array([ var defaultPasswordBytes = new Uint8Array([
0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08, 0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]); 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
var hashData = new Uint8Array(88), i = 0, j, n; var hashData = new Uint8Array(88), i = 0, j, n;
if (password) { if (password) {
n = Math.min(32, password.length); n = Math.min(32, password.length);
@ -183,9 +189,10 @@ var CipherTransformFactory = (function() {
var cipher, checkData; var cipher, checkData;
if (revision >= 3) { if (revision >= 3) {
// padded password in hashData, we can use this array for user password check // padded password in hashData, we can use this array for user
// password check
i = 32; i = 32;
for(j = 0, n = fileId.length; j < n; ++j) for (j = 0, n = fileId.length; j < n; ++j)
hashData[i++] = fileId[j]; hashData[i++] = fileId[j];
cipher = new ARCFourCipher(encryptionKey); cipher = new ARCFourCipher(encryptionKey);
var checkData = cipher.encryptBlock(md5(hashData, 0, i)); var checkData = cipher.encryptBlock(md5(hashData, 0, i));
@ -203,37 +210,38 @@ var CipherTransformFactory = (function() {
} }
for (j = 0, n = checkData.length; j < n; ++j) { for (j = 0, n = checkData.length; j < n; ++j) {
if (userPassword[j] != checkData[j]) if (userPassword[j] != checkData[j])
error("incorrect password"); error('incorrect password');
} }
return encryptionKey; return encryptionKey;
} }
function constructor(dict, fileId, password) { function constructor(dict, fileId, password) {
var filter = dict.get("Filter"); var filter = dict.get('Filter');
if (!IsName(filter) || filter.name != "Standard") if (!IsName(filter) || filter.name != 'Standard')
error("unknown encryption method"); error('unknown encryption method');
this.dict = dict; this.dict = dict;
var algorithm = dict.get("V"); var algorithm = dict.get('V');
if (!IsInt(algorithm) || if (!IsInt(algorithm) ||
(algorithm != 1 && algorithm != 2)) (algorithm != 1 && algorithm != 2))
error("unsupported encryption algorithm"); error('unsupported encryption algorithm');
// TODO support algorithm 4 // TODO support algorithm 4
var keyLength = dict.get("Length") || 40; var keyLength = dict.get('Length') || 40;
if (!IsInt(keyLength) || if (!IsInt(keyLength) ||
keyLength < 40 || (keyLength % 8) != 0) keyLength < 40 || (keyLength % 8) != 0)
error("invalid key length"); error('invalid key length');
// prepare keys // prepare keys
var ownerPassword = stringToBytes(dict.get("O")); var ownerPassword = stringToBytes(dict.get('O'));
var userPassword = stringToBytes(dict.get("U")); var userPassword = stringToBytes(dict.get('U'));
var flags = dict.get("P"); var flags = dict.get('P');
var revision = dict.get("R"); var revision = dict.get('R');
var fileIdBytes = stringToBytes(fileId); var fileIdBytes = stringToBytes(fileId);
var passwordBytes; var passwordBytes;
if (password) if (password)
passwordBytes = stringToBytes(password); passwordBytes = stringToBytes(password);
this.encryptionKey = prepareKeyData(fileIdBytes, passwordBytes, this.encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
ownerPassword, userPassword, flags, revision, keyLength); ownerPassword, userPassword,
flags, revision, keyLength);
} }
constructor.prototype = { constructor.prototype = {

1338
fonts.js Normal file → Executable file

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- / /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
"use strict"; 'use strict';
var GlyphsUnicode = { var GlyphsUnicode = {
A: 0x0041, A: 0x0041,
@ -2474,8 +2474,8 @@ var GlyphsUnicode = {
lameddageshhebrew: 0xFB3C, lameddageshhebrew: 0xFB3C,
lamedhebrew: 0x05DC, lamedhebrew: 0x05DC,
lamedholam: 0x05DC05B9, lamedholam: 0x05DC05B9,
lamedholamdagesh: "05DC 05B9 05BC", lamedholamdagesh: '05DC 05B9 05BC',
lamedholamdageshhebrew: "05DC 05B9 05BC", lamedholamdageshhebrew: '05DC 05B9 05BC',
lamedholamhebrew: 0x05DC05B9, lamedholamhebrew: 0x05DC05B9,
lamfinalarabic: 0xFEDE, lamfinalarabic: 0xFEDE,
lamhahinitialarabic: 0xFCCA, lamhahinitialarabic: 0xFCCA,
@ -2486,8 +2486,8 @@ var GlyphsUnicode = {
lammedialarabic: 0xFEE0, lammedialarabic: 0xFEE0,
lammeemhahinitialarabic: 0xFD88, lammeemhahinitialarabic: 0xFD88,
lammeeminitialarabic: 0xFCCC, lammeeminitialarabic: 0xFCCC,
lammeemjeeminitialarabic: "FEDF FEE4 FEA0", lammeemjeeminitialarabic: 'FEDF FEE4 FEA0',
lammeemkhahinitialarabic: "FEDF FEE4 FEA8", lammeemkhahinitialarabic: 'FEDF FEE4 FEA8',
largecircle: 0x25EF, largecircle: 0x25EF,
lbar: 0x019A, lbar: 0x019A,
lbelt: 0x026C, lbelt: 0x026C,
@ -3250,7 +3250,7 @@ var GlyphsUnicode = {
reharmenian: 0x0580, reharmenian: 0x0580,
rehfinalarabic: 0xFEAE, rehfinalarabic: 0xFEAE,
rehiragana: 0x308C, rehiragana: 0x308C,
rehyehaleflamarabic: "0631 FEF3 FE8E 0644", rehyehaleflamarabic: '0631 FEF3 FE8E 0644',
rekatakana: 0x30EC, rekatakana: 0x30EC,
rekatakanahalfwidth: 0xFF9A, rekatakanahalfwidth: 0xFF9A,
resh: 0x05E8, resh: 0x05E8,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Binary file not shown.

View File

@ -1,230 +0,0 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
body {
background-color: #929292;
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
margin: 0px;
padding: 0px;
}
canvas {
box-shadow: 0px 4px 10px #000;
-moz-box-shadow: 0px 4px 10px #000;
-webkit-box-shadow: 0px 4px 10px #000;
}
span {
font-size: 0.8em;
}
.control {
display: inline-block;
float: left;
margin: 0px 20px 0px 0px;
padding: 0px 4px 0px 0px;
}
.control > input {
float: left;
border: 1px solid #4d4d4d;
height: 20px;
padding: 0px;
margin: 0px 2px 0px 0px;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.25);
-moz-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.25);
-webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.25);
}
.control > select {
float: left;
border: 1px solid #4d4d4d;
height: 22px;
padding: 2px 0px 0px;
margin: 0px 0px 1px;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.25);
-moz-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.25);
-webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.25);
}
.control > span {
cursor: default;
float: left;
height: 18px;
margin: 5px 2px 0px;
padding: 0px;
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
}
.control .label {
clear: both;
float: left;
font-size: 0.65em;
margin: 2px 0px 0px;
position: relative;
text-align: center;
width: 100%;
}
.thumbnailPageNumber {
color: #fff;
font-size: 0.55em;
text-align: right;
margin: -6px 2px 6px 0px;
width: 102px;
}
.thumbnail {
width: 104px;
height: 134px;
margin: 0px auto 10px;
}
.page {
width: 816px;
height: 1056px;
margin: 10px auto;
}
#controls {
background-color: #eee;
border-bottom: 1px solid #666;
padding: 4px 0px 0px 8px;
position: fixed;
left: 0px;
top: 0px;
height: 40px;
width: 100%;
box-shadow: 0px 2px 8px #000;
-moz-box-shadow: 0px 2px 8px #000;
-webkit-box-shadow: 0px 2px 8px #000;
}
#controls input {
user-select: text;
-moz-user-select: text;
-webkit-user-select: text;
}
#previousPageButton {
background: url('images/buttons.png') no-repeat 0px -23px;
cursor: default;
display: inline-block;
float: left;
margin: 0px;
width: 28px;
height: 23px;
}
#previousPageButton.down {
background: url('images/buttons.png') no-repeat 0px -46px;
}
#previousPageButton.disabled {
background: url('images/buttons.png') no-repeat 0px 0px;
}
#nextPageButton {
background: url('images/buttons.png') no-repeat -28px -23px;
cursor: default;
display: inline-block;
float: left;
margin: 0px;
width: 28px;
height: 23px;
}
#nextPageButton.down {
background: url('images/buttons.png') no-repeat -28px -46px;
}
#nextPageButton.disabled {
background: url('images/buttons.png') no-repeat -28px 0px;
}
#openFileButton {
background: url('images/buttons.png') no-repeat -56px -23px;
cursor: default;
display: inline-block;
float: left;
margin: 0px 0px 0px 3px;
width: 29px;
height: 23px;
}
#openFileButton.down {
background: url('images/buttons.png') no-repeat -56px -46px;
}
#openFileButton.disabled {
background: url('images/buttons.png') no-repeat -56px 0px;
}
#fileInput {
display: none;
}
#pageNumber {
text-align: right;
}
#sidebar {
position: fixed;
width: 200px;
top: 62px;
bottom: 18px;
left: -140px;
transition: left 0.25s ease-in-out 1s;
-moz-transition: left 0.25s ease-in-out 1s;
-webkit-transition: left 0.25s ease-in-out 1s;
}
#sidebar:hover {
left: 0px;
transition: left 0.25s ease-in-out 0s;
-moz-transition: left 0.25s ease-in-out 0s;
-webkit-transition: left 0.25s ease-in-out 0s;
}
#sidebarBox {
background-color: rgba(0, 0, 0, 0.7);
width: 150px;
height: 100%;
border-top-right-radius: 8px;
border-bottom-right-radius: 8px;
-moz-border-radius-topright: 8px;
-moz-border-radius-bottomright: 8px;
-webkit-border-top-right-radius: 8px;
-webkit-border-bottom-right-radius: 8px;
box-shadow: 0px 2px 8px #000;
-moz-box-shadow: 0px 2px 8px #000;
-webkit-box-shadow: 0px 2px 8px #000;
}
#sidebarScrollView {
position: absolute;
overflow: hidden;
overflow-y: auto;
top: 10px;
bottom: 10px;
left: 10px;
width: 130px;
}
#sidebarContentView {
height: auto;
width: 100px;
}
#viewer {
margin: 44px 0px 0px;
padding: 8px 0px;
}

2634
pdf.js

File diff suppressed because it is too large Load Diff

209
test/driver.js Normal file
View File

@ -0,0 +1,209 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
/*
* A Test Driver for PDF.js
*/
var appPath, browser, canvas, currentTaskIdx, manifest, stdout;
function queryParams() {
var qs = window.location.search.substring(1);
var kvs = qs.split("&");
var params = { };
for (var i = 0; i < kvs.length; ++i) {
var kv = kvs[i].split("=");
params[unescape(kv[0])] = unescape(kv[1]);
}
return params;
}
function load() {
var params = queryParams();
browser = params.browser;
manifestFile = params.manifestFile;
appPath = params.path;
canvas = document.createElement("canvas");
canvas.mozOpaque = true;
stdout = document.getElementById("stdout");
log("load...\n");
log("Harness thinks this browser is '"+ browser + "' with path " + appPath + "\n");
log("Fetching manifest "+ manifestFile +"...");
var r = new XMLHttpRequest();
r.open("GET", manifestFile, false);
r.onreadystatechange = function(e) {
if (r.readyState == 4) {
log("done\n");
manifest = JSON.parse(r.responseText);
currentTaskIdx = 0, nextTask();
}
};
r.send(null);
}
window.onload = load;
function nextTask() {
if (currentTaskIdx == manifest.length) {
return done();
}
var task = manifest[currentTaskIdx];
task.round = 0;
log("Loading file "+ task.file +"\n");
var r = new XMLHttpRequest();
r.open("GET", task.file);
r.mozResponseType = r.responseType = "arraybuffer";
r.onreadystatechange = function() {
var failure;
if (r.readyState == 4) {
var data = r.mozResponseArrayBuffer || r.mozResponse ||
r.responseArrayBuffer || r.response;
try {
task.pdfDoc = new PDFDoc(new Stream(data));
} catch(e) {
failure = 'load PDF doc: '+ e.toString();
}
task.pageNum = 1, nextPage(task, failure);
}
};
r.send(null);
}
function isLastPage(task) {
return (task.pdfDoc && (task.pageNum > task.pdfDoc.numPages));
}
function nextPage(task, loadError) {
if (isLastPage(task)) {
if (++task.round < task.rounds) {
log(" Round "+ (1 + task.round) +"\n");
task.pageNum = 1;
} else {
++currentTaskIdx, nextTask();
return;
}
}
var failure = loadError || '';
var ctx = null;
var page = null;
if (!failure) {
try {
log(" loading page "+ task.pageNum +"... ");
ctx = canvas.getContext("2d");
page = task.pdfDoc.getPage(task.pageNum);
var pdfToCssUnitsCoef = 96.0 / 72.0;
// using mediaBox for the canvas size
var pageWidth = (page.mediaBox[2] - page.mediaBox[0]);
var pageHeight = (page.mediaBox[3] - page.mediaBox[1]);
canvas.width = pageWidth * pdfToCssUnitsCoef;
canvas.height = pageHeight * pdfToCssUnitsCoef;
clear(ctx);
page.startRendering(
ctx,
function() { snapshotCurrentPage(page, task, failure); });
} catch(e) {
failure = 'page setup: '+ e.toString();
}
}
if (failure) {
// Skip right to snapshotting if there was a failure, since the
// fonts might be in an inconsistent state.
snapshotCurrentPage(page, task, failure);
}
}
function snapshotCurrentPage(page, task, failure) {
log("done, snapshotting... ");
sendTaskResult(canvas.toDataURL("image/png"), task, failure);
log("done"+ (failure ? " (failed!: "+ failure +")" : "") +"\n");
// Set up the next request
backoff = (inFlightRequests > 0) ? inFlightRequests * 10 : 0;
setTimeout(function() {
++task.pageNum, nextPage(task);
},
backoff
);
}
function sendQuitRequest() {
var r = new XMLHttpRequest();
r.open("POST", "/tellMeToQuit?path=" + escape(appPath), false);
r.send("");
}
function quitApp() {
log("Done!");
document.body.innerHTML = "Tests are finished. <h1>CLOSE ME!</h1>";
if (window.SpecialPowers) {
SpecialPowers.quitApplication();
} else {
sendQuitRequest();
window.close();
}
}
function done() {
if (inFlightRequests > 0) {
document.getElementById("inFlightCount").innerHTML = inFlightRequests;
setTimeout(done, 100);
} else {
setTimeout(quitApp, 100);
}
}
var inFlightRequests = 0;
function sendTaskResult(snapshot, task, failure) {
var result = { browser: browser,
id: task.id,
numPages: task.pdfDoc.numPages,
failure: failure,
file: task.file,
round: task.round,
page: task.pageNum,
snapshot: snapshot };
var r = new XMLHttpRequest();
// (The POST URI is ignored atm.)
r.open("POST", "/submit_task_results", true);
r.setRequestHeader("Content-Type", "application/json");
r.onreadystatechange = function(e) {
if (r.readyState == 4) {
inFlightRequests--;
}
}
document.getElementById("inFlightCount").innerHTML = inFlightRequests++;
r.send(JSON.stringify(result));
}
function clear(ctx) {
ctx.save();
ctx.fillStyle = "rgb(255, 255, 255)";
ctx.fillRect(0, 0, canvas.width, canvas.height);
ctx.restore();
}
/* Auto-scroll if the scrollbar is near the bottom, otherwise do nothing. */
function checkScrolling() {
if ((stdout.scrollHeight - stdout.scrollTop) <= stdout.offsetHeight) {
stdout.scrollTop = stdout.scrollHeight;
}
}
function log(str) {
stdout.innerHTML += str;
checkScrolling();
}

View File

@ -0,0 +1 @@
http://oannis.com/DiwanProfile.pdf

View File

@ -0,0 +1,55 @@
%PDF-1.0
1 0 obj
<<
/Pages 2 0 R
/Type /Catalog
>>
endobj
2 0 obj
<<
/Count 1
/Kids [ 3 0 R ]
/Type /Pages
>>
endobj
3 0 obj
<<
/MediaBox [ 0 0 795 842 ]
/Parent 2 0 R
/Contents 4 0 R
/Resources <<
/Font <<
/F1 <<
/Name /F1
/BaseFont /Helvetica
/Subtype /Type1
/Type /Font
>>
>>
>>
/Type /Page
>>
endobj
4 0 obj
<<
/Filter /ASCIIHexDecode
/Length 111
>>stream
42540A2F46312033302054660A333530203735302054640A323020544C0A312054720A2848656C6C6F20776F726C642920546A0A45540A>
endstream
endobj
xref
0 5
0000000000 65535 f
0000000010 00000 n
0000000067 00000 n
0000000136 00000 n
0000000373 00000 n
trailer
<<
/Root 1 0 R
/Size 5
>>
startxref
568
%%EOF

View File

@ -0,0 +1 @@
http://www.unicode.org/charts/PDF/U10450.pdf

View File

@ -17,7 +17,6 @@ TMPDIR = 'tmp'
VERBOSE = False VERBOSE = False
SERVER_HOST = "localhost" SERVER_HOST = "localhost"
SERVER_PORT = 8080
class TestOptions(OptionParser): class TestOptions(OptionParser):
def __init__(self, **kwargs): def __init__(self, **kwargs):
@ -34,6 +33,8 @@ class TestOptions(OptionParser):
self.add_option("--reftest", action="store_true", dest="reftest", self.add_option("--reftest", action="store_true", dest="reftest",
help="Automatically start reftest showing comparison test failures, if there are any.", help="Automatically start reftest showing comparison test failures, if there are any.",
default=False) default=False)
self.add_option("--port", action="store", dest="port", type="int",
help="The port the HTTP server should listen on.", default=8080)
self.set_usage(USAGE_EXAMPLE) self.set_usage(USAGE_EXAMPLE)
def verifyOptions(self, options): def verifyOptions(self, options):
@ -44,7 +45,7 @@ class TestOptions(OptionParser):
if options.browser and options.browserManifestFile: if options.browser and options.browserManifestFile:
print "Warning: ignoring browser argument since manifest file was also supplied" print "Warning: ignoring browser argument since manifest file was also supplied"
if not options.browser and not options.browserManifestFile: if not options.browser and not options.browserManifestFile:
print "No browser arguments supplied, so just starting server on port %s." % SERVER_PORT print "Starting server on port %s." % options.port
return options return options
def prompt(question): def prompt(question):
@ -70,7 +71,6 @@ class State:
remaining = 0 remaining = 0
results = { } results = { }
done = False done = False
masterMode = False
numErrors = 0 numErrors = 0
numEqFailures = 0 numEqFailures = 0
numEqNoSnapshot = 0 numEqNoSnapshot = 0
@ -99,7 +99,7 @@ class PDFTestHandler(BaseHTTPRequestHandler):
self.send_header("Content-Type", MIMEs[ext]) self.send_header("Content-Type", MIMEs[ext])
self.send_header("Content-Length", os.path.getsize(path)) self.send_header("Content-Length", os.path.getsize(path))
self.end_headers() self.end_headers()
with open(path) as f: with open(path, "rb") as f:
self.wfile.write(f.read()) self.wfile.write(f.read())
def do_GET(self): def do_GET(self):
@ -157,7 +157,8 @@ class PDFTestHandler(BaseHTTPRequestHandler):
# sort the results since they sometimes come in out of order # sort the results since they sometimes come in out of order
for results in taskResults: for results in taskResults:
results.sort(key=lambda result: result.page) results.sort(key=lambda result: result.page)
check(State.manifest[id], taskResults, browser) check(State.manifest[id], taskResults, browser,
self.server.masterMode)
# Please oh please GC this ... # Please oh please GC this ...
del State.taskResults[browser][id] del State.taskResults[browser][id]
State.remaining -= 1 State.remaining -= 1
@ -188,7 +189,7 @@ class BaseBrowserCommand(object):
self._fixupMacPath() self._fixupMacPath()
if not os.path.exists(self.path): if not os.path.exists(self.path):
throw("Path to browser '%s' does not exist." % self.path) raise Exception("Path to browser '%s' does not exist." % self.path)
def setup(self): def setup(self):
self.tempDir = tempfile.mkdtemp() self.tempDir = tempfile.mkdtemp()
@ -275,7 +276,7 @@ def downloadLinkedPDFs(manifestList):
sys.stdout.flush() sys.stdout.flush()
response = urllib2.urlopen(link) response = urllib2.urlopen(link)
with open(f, 'w') as out: with open(f, 'wb') as out:
out.write(response.read()) out.write(response.read())
print 'done' print 'done'
@ -284,7 +285,6 @@ def setUp(options):
# Only serve files from a pdf.js clone # Only serve files from a pdf.js clone
assert not ANAL or os.path.isfile('../pdf.js') and os.path.isdir('../.git') assert not ANAL or os.path.isfile('../pdf.js') and os.path.isdir('../.git')
State.masterMode = options.masterMode
if options.masterMode and os.path.isdir(TMPDIR): if options.masterMode and os.path.isdir(TMPDIR):
print 'Temporary snapshot dir tmp/ is still around.' print 'Temporary snapshot dir tmp/ is still around.'
print 'tmp/ can be removed if it has nothing you need.' print 'tmp/ can be removed if it has nothing you need.'
@ -325,7 +325,7 @@ def startBrowsers(browsers, options):
for b in browsers: for b in browsers:
b.setup() b.setup()
print 'Launching', b.name print 'Launching', b.name
host = 'http://%s:%s' % (SERVER_HOST, SERVER_PORT) host = 'http://%s:%s' % (SERVER_HOST, options.port)
path = '/test/test_slave.html?' path = '/test/test_slave.html?'
qs = 'browser='+ urllib.quote(b.name) +'&manifestFile='+ urllib.quote(options.manifestFile) qs = 'browser='+ urllib.quote(b.name) +'&manifestFile='+ urllib.quote(options.manifestFile)
qs += '&path=' + b.path qs += '&path=' + b.path
@ -340,7 +340,7 @@ def teardownBrowsers(browsers):
print "Temp dir was ", b.tempDir print "Temp dir was ", b.tempDir
print "Error:", sys.exc_info()[0] print "Error:", sys.exc_info()[0]
def check(task, results, browser): def check(task, results, browser, masterMode):
failed = False failed = False
for r in xrange(len(results)): for r in xrange(len(results)):
pageResults = results[r] pageResults = results[r]
@ -359,7 +359,7 @@ def check(task, results, browser):
kind = task['type'] kind = task['type']
if 'eq' == kind: if 'eq' == kind:
checkEq(task, results, browser) checkEq(task, results, browser, masterMode)
elif 'fbf' == kind: elif 'fbf' == kind:
checkFBF(task, results, browser) checkFBF(task, results, browser)
elif 'load' == kind: elif 'load' == kind:
@ -368,7 +368,7 @@ def check(task, results, browser):
assert 0 and 'Unknown test type' assert 0 and 'Unknown test type'
def checkEq(task, results, browser): def checkEq(task, results, browser, masterMode):
pfx = os.path.join(REFDIR, sys.platform, browser, task['id']) pfx = os.path.join(REFDIR, sys.platform, browser, task['id'])
results = results[0] results = results[0]
taskId = task['id'] taskId = task['id']
@ -406,12 +406,12 @@ def checkEq(task, results, browser):
passed = False passed = False
State.numEqFailures += 1 State.numEqFailures += 1
if State.masterMode and (ref is None or not eq): if masterMode and (ref is None or not eq):
tmpTaskDir = os.path.join(TMPDIR, sys.platform, browser, task['id']) tmpTaskDir = os.path.join(TMPDIR, sys.platform, browser, task['id'])
try: try:
os.makedirs(tmpTaskDir) os.makedirs(tmpTaskDir)
except OSError, e: except OSError, e:
pass print >>sys.stderr, 'Creating', tmpTaskDir, 'failed!'
of = open(os.path.join(tmpTaskDir, str(page + 1)), 'w') of = open(os.path.join(tmpTaskDir, str(page + 1)), 'w')
of.write(snapshot) of.write(snapshot)
@ -482,8 +482,8 @@ def maybeUpdateRefImages(options, browser):
print 'done' print 'done'
def startReftest(browser): def startReftest(browser, options):
url = "http://%s:%s" % (SERVER_HOST, SERVER_PORT) url = "http://%s:%s" % (SERVER_HOST, options.port)
url += "/test/resources/reftest-analyzer.xhtml" url += "/test/resources/reftest-analyzer.xhtml"
url += "#web=/test/eq.log" url += "#web=/test/eq.log"
try: try:
@ -511,7 +511,7 @@ def runTests(options, browsers):
maybeUpdateRefImages(options, browsers[0]) maybeUpdateRefImages(options, browsers[0])
elif options.reftest and State.numEqFailures > 0: elif options.reftest and State.numEqFailures > 0:
print "\nStarting reftest harness to examine %d eq test failures." % State.numEqFailures print "\nStarting reftest harness to examine %d eq test failures." % State.numEqFailures
startReftest(browsers[0]) startReftest(browsers[0], options)
def main(): def main():
optionParser = TestOptions() optionParser = TestOptions()
@ -520,7 +520,8 @@ def main():
if options == None: if options == None:
sys.exit(1) sys.exit(1)
httpd = TestServer((SERVER_HOST, SERVER_PORT), PDFTestHandler) httpd = TestServer((SERVER_HOST, options.port), PDFTestHandler)
httpd.masterMode = options.masterMode
httpd_thread = threading.Thread(target=httpd.serve_forever) httpd_thread = threading.Thread(target=httpd.serve_forever)
httpd_thread.setDaemon(True) httpd_thread.setDaemon(True)
httpd_thread.start() httpd_thread.start()
@ -531,8 +532,11 @@ def main():
else: else:
# just run the server # just run the server
print "Running HTTP server. Press Ctrl-C to quit." print "Running HTTP server. Press Ctrl-C to quit."
try:
while True: while True:
time.sleep(1) time.sleep(1)
except (KeyboardInterrupt):
print "\nExiting."
if __name__ == '__main__': if __name__ == '__main__':
main() main()

View File

@ -26,6 +26,12 @@
"rounds": 1, "rounds": 1,
"type": "load" "type": "load"
}, },
{ "id": "shavian-load",
"file": "pdfs/shavian.pdf",
"link": true,
"rounds": 1,
"type": "load"
},
{ "id": "sizes", { "id": "sizes",
"file": "pdfs/sizes.pdf", "file": "pdfs/sizes.pdf",
"rounds": 1, "rounds": 1,
@ -36,5 +42,11 @@
"link": true, "link": true,
"rounds": 1, "rounds": 1,
"type": "eq" "type": "eq"
},
{ "id": "openoffice-pdf",
"file": "pdfs/DiwanProfile.pdf",
"link": true,
"rounds": 1,
"type": "load"
} }
] ]

View File

@ -6,222 +6,7 @@
<script type="text/javascript" src="/fonts.js"></script> <script type="text/javascript" src="/fonts.js"></script>
<script type="text/javascript" src="/crypto.js"></script> <script type="text/javascript" src="/crypto.js"></script>
<script type="text/javascript" src="/glyphlist.js"></script> <script type="text/javascript" src="/glyphlist.js"></script>
<script type="application/javascript"> <script type="text/javascript" src="driver.js"></script>
var appPath, browser, canvas, currentTask, currentTaskIdx, failure, manifest, numPages, pdfDoc, stdout;
function queryParams() {
var qs = window.location.search.substring(1);
var kvs = qs.split("&");
var params = { };
for (var i = 0; i < kvs.length; ++i) {
var kv = kvs[i].split("=");
params[unescape(kv[0])] = unescape(kv[1]);
}
return params;
}
function load() {
var params = queryParams();
browser = params.browser;
manifestFile = params.manifestFile;
appPath = params.path;
canvas = document.createElement("canvas");
canvas.mozOpaque = true;
stdout = document.getElementById("stdout");
log("Harness thinks this browser is '"+ browser + "' with path " + appPath + "\n");
log("Fetching manifest "+ manifestFile +"...");
var r = new XMLHttpRequest();
r.open("GET", manifestFile, false);
r.onreadystatechange = function(e) {
if (r.readyState == 4) {
log("done\n");
manifest = JSON.parse(r.responseText);
currentTaskIdx = 0, nextTask();
}
};
r.send(null);
}
function nextTask() {
if (currentTaskIdx == manifest.length) {
return done();
}
currentTask = manifest[currentTaskIdx];
currentTask.round = 0;
log("Loading file "+ currentTask.file +"\n");
var r = new XMLHttpRequest();
r.open("GET", currentTask.file);
r.mozResponseType = r.responseType = "arraybuffer";
r.onreadystatechange = function() {
if (r.readyState == 4) {
var data = r.mozResponseArrayBuffer || r.mozResponse ||
r.responseArrayBuffer || r.response;
try {
pdfDoc = new PDFDoc(new Stream(data));
numPages = pdfDoc.numPages;
} catch(e) {
numPages = 1;
failure = 'load PDF doc: '+ e.toString();
}
currentTask.pageNum = 1, nextPage();
}
};
r.send(null);
}
function nextPage() {
if (currentTask.pageNum > numPages) {
if (++currentTask.round < currentTask.rounds) {
log(" Round "+ (1 + currentTask.round) +"\n");
currentTask.pageNum = 1;
} else {
++currentTaskIdx, nextTask();
return;
}
}
failure = '';
log(" loading page "+ currentTask.pageNum +"... ");
var ctx = canvas.getContext("2d");
var fonts = [];
var gfx = null;
try {
gfx = new CanvasGraphics(ctx);
currentPage = pdfDoc.getPage(currentTask.pageNum);
currentPage.compile(gfx, fonts);
} catch(e) {
failure = 'compile: '+ e.toString();
}
try {
var pdfToCssUnitsCoef = 96.0 / 72.0;
// using mediaBox for the canvas size
var pageWidth = (currentPage.mediaBox[2] - currentPage.mediaBox[0]);
var pageHeight = (currentPage.mediaBox[3] - currentPage.mediaBox[1]);
canvas.width = pageWidth * pdfToCssUnitsCoef;
canvas.height = pageHeight * pdfToCssUnitsCoef;
clear(ctx);
} catch(e) {
failure = 'page setup: '+ e.toString();
}
if (!failure) {
try {
FontLoader.bind(fonts, function() { snapshotCurrentPage(gfx); });
} catch(e) {
failure = 'fonts: '+ e.toString();
}
}
if (failure) {
// Skip right to snapshotting if there was a failure, since the
// fonts might be in an inconsistent state.
snapshotCurrentPage(gfx);
}
}
function snapshotCurrentPage(gfx) {
log("done, snapshotting... ");
if (!failure) {
try {
currentPage.display(gfx);
} catch(e) {
failure = 'render: '+ e.toString();
}
}
sendTaskResult(canvas.toDataURL("image/png"));
log("done"+ (failure ? " (failed!)" : "") +"\n");
// Set up the next request
backoff = (inFlightRequests > 0) ? inFlightRequests * 10 : 0;
setTimeout(function() {
++currentTask.pageNum, nextPage();
},
backoff
);
}
function sendQuitRequest() {
var r = new XMLHttpRequest();
r.open("POST", "/tellMeToQuit?path=" + escape(appPath), false);
r.send("");
}
function quitApp() {
log("Done!");
document.body.innerHTML = "Tests are finished. <h1>CLOSE ME!</h1>";
if (window.SpecialPowers) {
SpecialPowers.quitApplication();
} else {
sendQuitRequest();
window.close();
}
}
function done() {
if (inFlightRequests > 0) {
document.getElementById("inFlightCount").innerHTML = inFlightRequests;
setTimeout(done, 100);
} else {
setTimeout(quitApp, 100);
}
}
var inFlightRequests = 0;
function sendTaskResult(snapshot) {
var result = { browser: browser,
id: currentTask.id,
numPages: numPages,
failure: failure,
file: currentTask.file,
round: currentTask.round,
page: currentTask.pageNum,
snapshot: snapshot };
var r = new XMLHttpRequest();
// (The POST URI is ignored atm.)
r.open("POST", "/submit_task_results", true);
r.setRequestHeader("Content-Type", "application/json");
r.onreadystatechange = function(e) {
if (r.readyState == 4) {
inFlightRequests--;
}
}
document.getElementById("inFlightCount").innerHTML = inFlightRequests++;
r.send(JSON.stringify(result));
}
function clear(ctx) {
ctx.save();
ctx.fillStyle = "rgb(255, 255, 255)";
ctx.fillRect(0, 0, canvas.width, canvas.height);
ctx.restore();
}
/* Auto-scroll if the scrollbar is near the bottom, otherwise do nothing. */
function checkScrolling() {
if ((stdout.scrollHeight - stdout.scrollTop) <= stdout.offsetHeight) {
stdout.scrollTop = stdout.scrollHeight;
}
}
function log(str) {
stdout.innerHTML += str;
checkScrolling();
}
</script>
</head> </head>
<body onload="load();"> <body onload="load();">

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- / /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
"use strict"; 'use strict';
/** /**
* The Type2 reader code below is only used for debugging purpose since Type2 * The Type2 reader code below is only used for debugging purpose since Type2
@ -21,7 +21,7 @@ function readCharset(aStream, aCharstrings) {
var format = aStream.getByte(); var format = aStream.getByte();
if (format == 0) { if (format == 0) {
charset[".notdef"] = readCharstringEncoding(aCharstrings[0]); charset['.notdef'] = readCharstringEncoding(aCharstrings[0]);
var count = aCharstrings.length - 1; var count = aCharstrings.length - 1;
for (var i = 1; i < count + 1; i++) { for (var i = 1; i < count + 1; i++) {
@ -30,13 +30,13 @@ function readCharset(aStream, aCharstrings) {
//log(CFFStrings[sid] + "::" + charset[CFFStrings[sid]]); //log(CFFStrings[sid] + "::" + charset[CFFStrings[sid]]);
} }
} else if (format == 1) { } else if (format == 1) {
error("Charset Range are not supported"); error('Charset Range are not supported');
} else { } else {
error("Invalid charset format"); error('Invalid charset format');
} }
return charset; return charset;
}; }
/** /**
* Take a Type2 binary charstring as input and transform it to a human * Take a Type2 binary charstring as input and transform it to a human
@ -83,7 +83,7 @@ function readCharstringEncoding(aString) {
} }
return charstringTokens; return charstringTokens;
}; }
/** /**
@ -108,7 +108,7 @@ function readFontDictData(aString, aMap) {
aString[i++] << 8 | aString[i++] << 8 |
aString[i++]; aString[i++];
} else if (value == 30) { } else if (value == 30) {
token = ""; token = '';
var parsed = false; var parsed = false;
while (!parsed) { while (!parsed) {
var byte = aString[i++]; var byte = aString[i++];
@ -118,18 +118,18 @@ function readFontDictData(aString, aMap) {
var nibble = nibbles[j]; var nibble = nibbles[j];
switch (nibble) { switch (nibble) {
case 0xA: case 0xA:
token += "."; token += '.';
break; break;
case 0xB: case 0xB:
token += "E"; token += 'E';
break; break;
case 0xC: case 0xC:
token += "E-"; token += 'E-';
break; break;
case 0xD: case 0xD:
break; break;
case 0xE: case 0xE:
token += "-"; token += '-';
break; break;
case 0xF: case 0xF:
parsed = true; parsed = true;
@ -139,7 +139,7 @@ function readFontDictData(aString, aMap) {
break; break;
} }
} }
}; }
token = parseFloat(token); token = parseFloat(token);
} else if (value <= 31) { } else if (value <= 31) {
token = aMap[value]; token = aMap[value];
@ -150,14 +150,14 @@ function readFontDictData(aString, aMap) {
} else if (value <= 254) { } else if (value <= 254) {
token = -((value - 251) * 256) - aString[i++] - 108; token = -((value - 251) * 256) - aString[i++] - 108;
} else if (value == 255) { } else if (value == 255) {
error("255 is not a valid DICT command"); error('255 is not a valid DICT command');
} }
fontDictDataTokens.push(token); fontDictDataTokens.push(token);
} }
return fontDictDataTokens; return fontDictDataTokens;
}; }
/** /**
@ -192,7 +192,7 @@ function readFontIndexData(aStream, aIsByte) {
return aStream.getByte() << 24 | aStream.getByte() << 16 | return aStream.getByte() << 24 | aStream.getByte() << 16 |
aStream.getByte() << 8 | aStream.getByte(); aStream.getByte() << 8 | aStream.getByte();
} }
error(offsize + " is not a valid offset size"); error(offsize + ' is not a valid offset size');
return null; return null;
}; };
@ -200,7 +200,8 @@ function readFontIndexData(aStream, aIsByte) {
for (var i = 0; i < count + 1; i++) for (var i = 0; i < count + 1; i++)
offsets.push(getNextOffset()); offsets.push(getNextOffset());
log("Found " + count + " objects at offsets :" + offsets + " (offsize: " + offsize + ")"); log('Found ' + count + ' objects at offsets :' +
offsets + ' (offsize: ' + offsize + ')');
// Now extract the objects // Now extract the objects
var relativeOffset = aStream.pos; var relativeOffset = aStream.pos;
@ -217,15 +218,15 @@ function readFontIndexData(aStream, aIsByte) {
} }
return objects; return objects;
}; }
var Type2Parser = function(aFilePath) { var Type2Parser = function(aFilePath) {
var font = new Dict(); var font = new Dict();
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open("GET", aFilePath, false); xhr.open('GET', aFilePath, false);
xhr.mozResponseType = xhr.responseType = "arraybuffer"; xhr.mozResponseType = xhr.responseType = 'arraybuffer';
xhr.expected = (document.URL.indexOf("file:") == 0) ? 0 : 200; xhr.expected = (document.URL.indexOf('file:') == 0) ? 0 : 200;
xhr.send(null); xhr.send(null);
this.data = new Stream(xhr.mozResponseArrayBuffer || xhr.mozResponse || this.data = new Stream(xhr.mozResponseArrayBuffer || xhr.mozResponse ||
xhr.responseArrayBuffer || xhr.response); xhr.responseArrayBuffer || xhr.response);
@ -249,19 +250,19 @@ var Type2Parser = function(aFilePath) {
stack.push(token); stack.push(token);
} else { } else {
switch (token.operand) { switch (token.operand) {
case "SID": case 'SID':
font.set(token.name, CFFStrings[stack.pop()]); font.set(token.name, CFFStrings[stack.pop()]);
break; break;
case "number number": case 'number number':
font.set(token.name, { font.set(token.name, {
offset: stack.pop(), offset: stack.pop(),
size: stack.pop() size: stack.pop()
}); });
break; break;
case "boolean": case 'boolean':
font.set(token.name, stack.pop()); font.set(token.name, stack.pop());
break; break;
case "delta": case 'delta':
font.set(token.name, stack.pop()); font.set(token.name, stack.pop());
break; break;
default: default:
@ -280,32 +281,32 @@ var Type2Parser = function(aFilePath) {
}; };
this.parse = function(aStream) { this.parse = function(aStream) {
font.set("major", aStream.getByte()); font.set('major', aStream.getByte());
font.set("minor", aStream.getByte()); font.set('minor', aStream.getByte());
font.set("hdrSize", aStream.getByte()); font.set('hdrSize', aStream.getByte());
font.set("offsize", aStream.getByte()); font.set('offsize', aStream.getByte());
// Move the cursor after the header // Move the cursor after the header
aStream.skip(font.get("hdrSize") - aStream.pos); aStream.skip(font.get('hdrSize') - aStream.pos);
// Read the NAME Index // Read the NAME Index
dump("Reading Index: Names"); dump('Reading Index: Names');
font.set("Names", readFontIndexData(aStream)); font.set('Names', readFontIndexData(aStream));
log("Names: " + font.get("Names")); log('Names: ' + font.get('Names'));
// Read the Top Dict Index // Read the Top Dict Index
dump("Reading Index: TopDict"); dump('Reading Index: TopDict');
var topDict = readFontIndexData(aStream, true); var topDict = readFontIndexData(aStream, true);
log("TopDict: " + topDict); log('TopDict: ' + topDict);
// Read the String Index // Read the String Index
dump("Reading Index: Strings"); dump('Reading Index: Strings');
var strings = readFontIndexData(aStream); var strings = readFontIndexData(aStream);
log("strings: " + strings); log('strings: ' + strings);
// Fill up the Strings dictionary with the new unique strings // Fill up the Strings dictionary with the new unique strings
for (var i = 0; i < strings.length; i++) for (var i = 0; i < strings.length; i++)
CFFStrings.push(strings[i].join("")); CFFStrings.push(strings[i].join(''));
// Parse the TopDict operator // Parse the TopDict operator
var objects = []; var objects = [];
@ -315,39 +316,40 @@ var Type2Parser = function(aFilePath) {
// Read the Global Subr Index that comes just after the Strings Index // Read the Global Subr Index that comes just after the Strings Index
// (cf. "The Compact Font Format Specification" Chapter 16) // (cf. "The Compact Font Format Specification" Chapter 16)
dump("Reading Global Subr Index"); dump('Reading Global Subr Index');
var subrs = readFontIndexData(aStream, true); var subrs = readFontIndexData(aStream, true);
dump(subrs); dump(subrs);
// Reading Private Dict // Reading Private Dict
var priv = font.get("Private"); var priv = font.get('Private');
log("Reading Private Dict (offset: " + priv.offset + " size: " + priv.size + ")"); log('Reading Private Dict (offset: ' + priv.offset +
' size: ' + priv.size + ')');
aStream.pos = priv.offset; aStream.pos = priv.offset;
var privateDict = []; var privateDict = [];
for (var i = 0; i < priv.size; i++) for (var i = 0; i < priv.size; i++)
privateDict.push(aStream.getByte()); privateDict.push(aStream.getByte());
dump("private:" + privateDict); dump('private:' + privateDict);
parseAsToken(privateDict, CFFDictPrivateDataMap); parseAsToken(privateDict, CFFDictPrivateDataMap);
for (var p in font.map) for (var p in font.map)
dump(p + "::" + font.get(p)); dump(p + '::' + font.get(p));
// Read CharStrings Index // Read CharStrings Index
var charStringsOffset = font.get("CharStrings"); var charStringsOffset = font.get('CharStrings');
dump("Read CharStrings Index (offset: " + charStringsOffset + ")"); dump('Read CharStrings Index (offset: ' + charStringsOffset + ')');
aStream.pos = charStringsOffset; aStream.pos = charStringsOffset;
var charStrings = readFontIndexData(aStream, true); var charStrings = readFontIndexData(aStream, true);
// Read Charset // Read Charset
dump("Read Charset for " + charStrings.length + " glyphs"); dump('Read Charset for ' + charStrings.length + ' glyphs');
var charsetEntry = font.get("charset"); var charsetEntry = font.get('charset');
if (charsetEntry == 0) { if (charsetEntry == 0) {
error("Need to support CFFISOAdobeCharset"); error('Need to support CFFISOAdobeCharset');
} else if (charsetEntry == 1) { } else if (charsetEntry == 1) {
error("Need to support CFFExpert"); error('Need to support CFFExpert');
} else if (charsetEntry == 2) { } else if (charsetEntry == 2) {
error("Need to support CFFExpertSubsetCharset"); error('Need to support CFFExpertSubsetCharset');
} else { } else {
aStream.pos = charsetEntry; aStream.pos = charsetEntry;
var charset = readCharset(aStream, charStrings); var charset = readCharset(aStream, charStrings);
@ -378,23 +380,23 @@ var Type2Parser = function(aFilePath) {
* writeToFile(fontData, "/tmp/pdf.js." + fontCount + ".cff"); * writeToFile(fontData, "/tmp/pdf.js." + fontCount + ".cff");
*/ */
function writeToFile(aBytes, aFilePath) { function writeToFile(aBytes, aFilePath) {
if (!("netscape" in window)) if (!('netscape' in window))
return; return;
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
var Cc = Components.classes, var Cc = Components.classes,
Ci = Components.interfaces; Ci = Components.interfaces;
var file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsILocalFile); var file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsILocalFile);
file.initWithPath(aFilePath); file.initWithPath(aFilePath);
var stream = Cc["@mozilla.org/network/file-output-stream;1"] var stream = Cc['@mozilla.org/network/file-output-stream;1']
.createInstance(Ci.nsIFileOutputStream); .createInstance(Ci.nsIFileOutputStream);
stream.init(file, 0x04 | 0x08 | 0x20, 0x180, 0); stream.init(file, 0x04 | 0x08 | 0x20, 0x180, 0);
var bos = Cc["@mozilla.org/binaryoutputstream;1"] var bos = Cc['@mozilla.org/binaryoutputstream;1']
.createInstance(Ci.nsIBinaryOutputStream); .createInstance(Ci.nsIBinaryOutputStream);
bos.setOutputStream(stream); bos.setOutputStream(stream);
bos.writeByteArray(aBytes, aBytes.length); bos.writeByteArray(aBytes, aBytes.length);
stream.close(); stream.close();
}; }

111
viewer.js
View File

@ -1,111 +0,0 @@
/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- /
/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
"use strict";
var pdfDocument, canvas, pageScale, pageDisplay, pageNum, numPages;
function load(userInput) {
canvas = document.getElementById("canvas");
canvas.mozOpaque = true;
pageNum = ("page" in queryParams()) ? parseInt(queryParams().page) : 1;
pageScale = ("scale" in queryParams()) ? parseInt(queryParams().scale) : 1.5;
var fileName = userInput;
if (!userInput) {
fileName = queryParams().file || "compressed.tracemonkey-pldi-09.pdf";
}
open(fileName);
}
function queryParams() {
var qs = window.location.search.substring(1);
var kvs = qs.split("&");
var params = { };
for (var i = 0; i < kvs.length; ++i) {
var kv = kvs[i].split("=");
params[unescape(kv[0])] = unescape(kv[1]);
}
return params;
}
function open(url) {
document.title = url;
var req = new XMLHttpRequest();
req.open("GET", url);
req.mozResponseType = req.responseType = "arraybuffer";
req.expected = (document.URL.indexOf("file:") == 0) ? 0 : 200;
req.onreadystatechange = function() {
if (req.readyState == 4 && req.status == req.expected) {
var data = req.mozResponseArrayBuffer || req.mozResponse ||
req.responseArrayBuffer || req.response;
pdfDocument = new PDFDoc(new Stream(data));
numPages = pdfDocument.numPages;
document.getElementById("numPages").innerHTML = numPages.toString();
goToPage(pageNum);
}
};
req.send(null);
}
function gotoPage(num) {
if (0 <= num && num <= numPages)
pageNum = num;
displayPage(pageNum);
}
function displayPage(num) {
document.getElementById("pageNumber").value = num;
var t0 = Date.now();
var page = pdfDocument.getPage(pageNum = num);
var pdfToCssUnitsCoef = 96.0 / 72.0;
var pageWidth = (page.mediaBox[2] - page.mediaBox[0]);
var pageHeight = (page.mediaBox[3] - page.mediaBox[1]);
canvas.width = pageScale * pageWidth * pdfToCssUnitsCoef;
canvas.height = pageScale * pageHeight * pdfToCssUnitsCoef;
var t1 = Date.now();
var ctx = canvas.getContext("2d");
ctx.save();
ctx.fillStyle = "rgb(255, 255, 255)";
ctx.fillRect(0, 0, canvas.width, canvas.height);
ctx.restore();
var gfx = new CanvasGraphics(ctx);
// page.compile will collect all fonts for us, once we have loaded them
// we can trigger the actual page rendering with page.display
var fonts = [];
page.compile(gfx, fonts);
var t2 = Date.now();
function displayPage() {
var t3 = Date.now();
page.display(gfx);
var t4 = Date.now();
var infoDisplay = document.getElementById("info");
infoDisplay.innerHTML = "Time to load/compile/fonts/render: "+ (t1 - t0) + "/" + (t2 - t1) + "/" + (t3 - t2) + "/" + (t4 - t3) + " ms";
}
FontLoader.bind(fonts, displayPage);
}
function nextPage() {
if (pageNum < pdfDocument.numPages)
displayPage(++pageNum);
}
function prevPage() {
if (pageNum > 1)
displayPage(--pageNum);
}
function goToPage(num) {
if (0 <= num && num <= numPages)
displayPage(pageNum = num);
}

156
web/compatibility.js Normal file
View File

@ -0,0 +1,156 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
// Checking if the typed arrays are supported
(function() {
if (typeof Uint8Array !== 'undefined')
return;
function subarray(start, end) {
return this.slice(start, end);
}
function set_(array, offset) {
if (arguments.length < 2) offset = 0;
for (var i = 0, n = array.length; i < n; ++i, ++offset)
this[offset] = array[i] & 0xFF;
}
function TypedArray(arg1) {
var result;
if (typeof arg1 === 'number') {
result = new Array(arg1);
for (var i = 0; i < arg1; ++i)
result[i] = 0;
} else
result = arg1.slice(0);
result.subarray = subarray;
result.buffer = result;
result.byteLength = result.length;
result.set = set_;
if (typeof arg1 === 'object' && arg1.buffer)
result.buffer = arg1.buffer;
return result;
}
window.Uint8Array = TypedArray;
// we don't need support for set, byteLength for 32-bit array
// so we can use the TypedArray as well
window.Uint32Array = TypedArray;
window.Int32Array = TypedArray;
})();
// Object.create() ?
(function() {
if (typeof Object.create !== 'undefined')
return;
Object.create = function(proto) {
var constructor = function() {};
constructor.prototype = proto;
return new constructor();
};
})();
// Object.defineProperty() ?
(function() {
if (typeof Object.defineProperty !== 'undefined')
return;
Object.defineProperty = function(obj, name, def) {
delete obj[name];
if ('get' in def)
obj.__defineGetter__(name, def['get']);
if ('set' in def)
obj.__defineSetter__(name, def['set']);
if ('value' in def) {
obj.__defineSetter__(name, function(value) {
this.__defineGetter__(name, function() {
return value;
});
return value;
});
obj[name] = def.value;
}
};
})();
// No XMLHttpRequest.response ?
(function() {
var xhrPrototype = XMLHttpRequest.prototype;
if ('response' in xhrPrototype ||
'mozResponseArrayBuffer' in xhrPrototype ||
'mozResponse' in xhrPrototype ||
'responseArrayBuffer' in xhrPrototype)
return;
// IE ?
if (typeof VBArray !== 'undefined') {
Object.defineProperty(xhrPrototype, 'response', {
get: function() {
return new Uint8Array(new VBArray(this.responseBody).toArray());
}
});
return;
}
// other browsers
function responseTypeSetter() {
// will be only called to set "arraybuffer"
this.overrideMimeType('text/plain; charset=x-user-defined');
}
if (typeof xhrPrototype.overrideMimeType === 'function') {
Object.defineProperty(xhrPrototype, 'responseType',
{ set: responseTypeSetter });
}
function responseGetter() {
var text = this.responseText;
var i, n = text.length;
var result = new Uint8Array(n);
for (i = 0; i < n; ++i)
result[i] = text.charCodeAt(i) & 0xFF;
return result;
}
Object.defineProperty(xhrPrototype, 'response', { get: responseGetter });
})();
// window.btoa (base64 encode function) ?
(function() {
if ('btoa' in window)
return;
var digits =
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
window.btoa = function(chars) {
var buffer = '';
var i, n;
for (i = 0, n = chars.length; i < n; i += 3) {
var b1 = chars.charCodeAt(i) & 0xFF;
var b2 = chars.charCodeAt(i + 1) & 0xFF;
var b3 = chars.charCodeAt(i + 2) & 0xFF;
var d1 = b1 >> 2, d2 = ((b1 & 3) << 4) | (b2 >> 4);
var d3 = i + 1 < n ? ((b2 & 0xF) << 2) | (b3 >> 6) : 64;
var d4 = i + 2 < n ? (b3 & 0x3F) : 64;
buffer += (digits.charAt(d1) + digits.charAt(d2) +
digits.charAt(d3) + digits.charAt(d4));
}
return buffer;
};
})();
// Function.prototype.bind ?
(function() {
if (typeof Function.prototype.bind !== 'undefined')
return;
Function.prototype.bind = function(obj) {
var fn = this, headArgs = Array.prototype.slice.call(arguments, 1);
var binded = function(tailArgs) {
var args = headArgs.concat(tailArgs);
return fn.apply(obj, args);
};
return binded;
};
})();

BIN
web/images/buttons.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

88
web/index.html.template Normal file
View File

@ -0,0 +1,88 @@
<!DOCTYPE html>
<html>
<head>
<meta charset='utf-8'>
<title>andreasgal/pdf.js @ GitHub</title>
<style type="text/css">
body {
margin-top: 1.0em;
background-color: #482a30;
font-family: Helvetica, Arial, FreeSans, san-serif;
color: #ffffff;
}
#container {
margin: 0 auto;
width: 700px;
}
h1 { font-size: 3.8em; color: #b7d5cf; margin-bottom: 3px; }
h1 .small { font-size: 0.4em; }
h1 a { text-decoration: none }
h2 { font-size: 1.5em; color: #b7d5cf; }
h3 { text-align: center; color: #b7d5cf; }
a { color: #b7d5cf; }
.description { font-size: 1.2em; margin-bottom: 30px; margin-top: 30px; font-style: italic;}
.download { float: right; }
pre { background: #000; color: #fff; padding: 15px;}
hr { border: 0; width: 80%; border-bottom: 1px solid #aaa}
.footer { text-align:center; padding-top:30px; font-style: italic; }
</style>
</head>
<body>
<a href="http://github.com/andreasgal/pdf.js"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
<div id="container">
<div class="download">
<a href="http://github.com/andreasgal/pdf.js/zipball/master">
<img border="0" width="90" src="http://github.com/images/modules/download/zip.png"></a>
<a href="http://github.com/andreasgal/pdf.js/tarball/master">
<img border="0" width="90" src="http://github.com/images/modules/download/tar.png"></a>
</div>
<h1><a href="http://github.com/andreasgal/pdf.js">pdf.js</a>
<span class="small">by <a href="http://github.com/andreasgal">andreasgal</a></span></h1>
<div class="description">
PDF Reader in JavaScript
</div>
<h2>Try it out!</h2>
<p>Live <a href="web/multi_page_viewer.html">demo</a> lives here.</p>
<h2>Authors</h2>
<p>Vivien Nicolas (21@vingtetun.org)
<br/>Andreas Gal (andreas.gal@gmail.com)
<br/>Soumya Deb (debloper@gmail.com)
<br/>Chris Jones (jones.chris.g@gmail.com)
<br/>Justin D'Arcangelo (justindarc@gmail.com)
<br/>sbarman (sbarman@eecs.berkeley.edu)
<br/>
<br/> </p>
<h2>Contact</h2>
<p> (andreas.gal@gmail.com)
<br/> </p>
<h2>Download</h2>
<p>
You can download this project in either
<a href="http://github.com/andreasgal/pdf.js/zipball/master">zip</a> or
<a href="http://github.com/andreasgal/pdf.js/tarball/master">tar</a> formats.
</p>
<p>You can also clone the project with <a href="http://git-scm.com">Git</a>
by running:
<pre>$ git clone git://github.com/andreasgal/pdf.js</pre>
</p>
<div class="footer">
get the source code on GitHub : <a href="http://github.com/andreasgal/pdf.js">andreasgal/pdf.js</a>
</div>
</div>
</body>
</html>

296
web/multi_page_viewer.css Normal file
View File

@ -0,0 +1,296 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
body {
background-color: #929292;
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
margin: 0px;
padding: 0px;
}
canvas {
box-shadow: 0px 4px 10px #000;
-moz-box-shadow: 0px 4px 10px #000;
-webkit-box-shadow: 0px 4px 10px #000;
}
span {
font-size: 0.8em;
text-shadow: 0px 1px 0px #fff;
}
.control {
display: inline-block;
float: left;
margin: 0px 20px 0px 0px;
padding: 0px 4px 0px 0px;
}
.control > input {