From 22e7c90a574fe0c700adc3a58fd8ad2693f13157 Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Fri, 17 Jul 2015 21:43:11 +0100
Subject: [PATCH] PDF.js version 1.1.311

---
 bower.json            |  2 +-
 build/pdf.combined.js | 11 +++++------
 build/pdf.js          | 10 +++++-----
 build/pdf.worker.js   |  5 ++---
 package.json          |  2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/bower.json b/bower.json
index 42a272a66..567af0d41 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.309",
+  "version": "1.1.311",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index bd0232dca..92c320b4f 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.1.309';
-PDFJS.build = '4b6e272';
+PDFJS.version = '1.1.311';
+PDFJS.build = '7065c1b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -6602,7 +6602,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
     style.fontFamily = fontFamily + fallbackName;
   }
 
-  function initContainer(item, drawBorder) {
+  function initContainer(item) {
     var container = document.createElement('section');
     var cstyle = container.style;
     var width = item.rect[2] - item.rect[0];
@@ -6706,7 +6706,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
       rect[2] = rect[0] + (rect[3] - rect[1]); // make it square
     }
 
-    var container = initContainer(item, false);
+    var container = initContainer(item);
     container.className = 'annotText';
 
     var image  = document.createElement('img');
@@ -6813,7 +6813,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
   }
 
   function getHtmlElementForLinkAnnotation(item) {
-    var container = initContainer(item, true);
+    var container = initContainer(item);
     container.className = 'annotLink';
 
     var link = document.createElement('a');
@@ -11466,7 +11466,6 @@ var Annotation = (function AnnotationClosure() {
           this.borderStyle.setHorizontalCornerRadius(array[0]);
           this.borderStyle.setVerticalCornerRadius(array[1]);
           this.borderStyle.setWidth(array[2]);
-          this.borderStyle.setStyle('S');
 
           if (array.length === 4) { // Dash array available
             this.borderStyle.setDashArray(array[3]);
diff --git a/build/pdf.js b/build/pdf.js
index 0a1df5424..b59b0bc02 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.1.309';
-PDFJS.build = '4b6e272';
+PDFJS.version = '1.1.311';
+PDFJS.build = '7065c1b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -6646,7 +6646,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
     style.fontFamily = fontFamily + fallbackName;
   }
 
-  function initContainer(item, drawBorder) {
+  function initContainer(item) {
     var container = document.createElement('section');
     var cstyle = container.style;
     var width = item.rect[2] - item.rect[0];
@@ -6750,7 +6750,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
       rect[2] = rect[0] + (rect[3] - rect[1]); // make it square
     }
 
-    var container = initContainer(item, false);
+    var container = initContainer(item);
     container.className = 'annotText';
 
     var image  = document.createElement('img');
@@ -6857,7 +6857,7 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
   }
 
   function getHtmlElementForLinkAnnotation(item) {
-    var container = initContainer(item, true);
+    var container = initContainer(item);
     container.className = 'annotLink';
 
     var link = document.createElement('a');
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index 7592acd00..ff8ee829f 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.1.309';
-PDFJS.build = '4b6e272';
+PDFJS.version = '1.1.311';
+PDFJS.build = '7065c1b';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -5062,7 +5062,6 @@ var Annotation = (function AnnotationClosure() {
           this.borderStyle.setHorizontalCornerRadius(array[0]);
           this.borderStyle.setVerticalCornerRadius(array[1]);
           this.borderStyle.setWidth(array[2]);
-          this.borderStyle.setStyle('S');
 
           if (array.length === 4) { // Dash array available
             this.borderStyle.setDashArray(array[3]);
diff --git a/package.json b/package.json
index e499a450c..da36af7b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.309",
+  "version": "1.1.311",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",