From 5bb6c564756eb36a05cb7dece48122056fbed86a Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Mon, 22 Sep 2014 16:29:23 -0500
Subject: [PATCH] PDF.js version 1.0.469

---
 bower.json            |  2 +-
 build/pdf.combined.js |  4 ++--
 build/pdf.js          |  4 ++--
 build/pdf.worker.js   |  4 ++--
 package.json          |  2 +-
 web/compatibility.js  | 22 +++++++++++-----------
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bower.json b/bower.json
index f10a8943d..2da402078 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.467",
+  "version": "1.0.469",
   "keywords": [
     "Mozilla",
     "pdf",
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 16cacad89..8d2bc434b 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.467';
-PDFJS.build = '53320ce';
+PDFJS.version = '1.0.469';
+PDFJS.build = '780f86b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.js b/build/pdf.js
index 83c38fb0f..5c74c66e5 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.467';
-PDFJS.build = '53320ce';
+PDFJS.version = '1.0.469';
+PDFJS.build = '780f86b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index 482b26eb6..2b91fbb5f 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.467';
-PDFJS.build = '53320ce';
+PDFJS.version = '1.0.469';
+PDFJS.build = '780f86b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/package.json b/package.json
index e7fbcf9ca..d1bd31809 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.467",
+  "version": "1.0.469",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",
diff --git a/web/compatibility.js b/web/compatibility.js
index 73f78825f..a21bf6a29 100644
--- a/web/compatibility.js
+++ b/web/compatibility.js
@@ -481,7 +481,7 @@ if (typeof PDFJS === 'undefined') {
   }
 })();
 
-// Support: IE<11, Chrome<21, Android<4.4
+// Support: IE<11, Chrome<21, Android<4.4, Safari<6
 (function checkSetPresenceInImageData() {
   // IE < 11 will use window.CanvasPixelArray which lacks set function.
   if (window.CanvasPixelArray) {
@@ -495,21 +495,21 @@ if (typeof PDFJS === 'undefined') {
   } else {
     // Old Chrome and Android use an inaccessible CanvasPixelArray prototype.
     // Because we cannot feature detect it, we rely on user agent parsing.
-    var polyfill = false;
+    var polyfill = false, versionMatch;
     if (navigator.userAgent.indexOf('Chrom') >= 0) {
-      var versionMatch = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
-      if (versionMatch && parseInt(versionMatch[2]) < 21) {
-        // Chrome < 21 lacks the set function.
-        polyfill = true;
-      }
+      versionMatch = navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./);
+      // Chrome < 21 lacks the set function.
+      polyfill = versionMatch && parseInt(versionMatch[2]) < 21;
     } else if (navigator.userAgent.indexOf('Android') >= 0) {
       // Android < 4.4 lacks the set function.
       // Android >= 4.4 will contain Chrome in the user agent,
       // thus pass the Chrome check above and not reach this block.
-      var isOldAndroid = /Android\s[0-4][^\d]/g.test(navigator.userAgent);
-      if (isOldAndroid) {
-        polyfill = true;
-      }
+      polyfill = /Android\s[0-4][^\d]/g.test(navigator.userAgent);
+    } else if (navigator.userAgent.indexOf('Safari') >= 0) {
+      versionMatch = navigator.userAgent.
+        match(/Version\/([0-9]+)\.([0-9]+)\.([0-9]+) Safari\//);
+      // Safari < 6 lacks the set function.
+      polyfill = versionMatch && parseInt(versionMatch[1]) < 6;
     }
 
     if (polyfill) {