Merge pull request mozilla#3123 from mduan/issue3115

yurydelendik · yurydelendik · commit e27a604d1f74 · 2013-04-20T10:48:34.000-07:00
Do not cache content stream
diff --git a/src/core.js b/src/core.js
@@ -84,7 +84,7 @@ var Page = (function PageClosure() {
       return obj;
     },
     get content() {
-      return shadow(this, 'content', this.getPageProp('Contents'));
+      return this.getPageProp('Contents');
     },
     get resources() {
       return shadow(this, 'resources', this.inheritPageProp('Resources'));
@@ -131,21 +131,22 @@ var Page = (function PageClosure() {
     },
     getContentStream: function Page_getContentStream() {
       var content = this.content;
+      var stream;
       if (isArray(content)) {
         // fetching items
         var xref = this.xref;
         var i, n = content.length;
         var streams = [];
         for (i = 0; i < n; ++i)
           streams.push(xref.fetchIfRef(content[i]));
-        content = new StreamsSequenceStream(streams);
+        stream = new StreamsSequenceStream(streams);
       } else if (isStream(content)) {
-        content.reset();
-      } else if (!content) {
+        stream = content;
+      } else {
         // replacing non-existent page content with empty one
-        content = new NullStream();
+        stream = new NullStream();
       }
-      return content;
+      return stream;
     },
     getOperatorList: function Page_getOperatorList(handler) {
       var self = this;
diff --git a/test/pdfs/issue3115.pdf.link b/test/pdfs/issue3115.pdf.link
@@ -0,0 +1 @@
+http://mirrors.ctan.org/info/lshort/english/lshort.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -170,6 +170,15 @@
        "rounds": 1,
        "type": "eq"
     },
+    {
+      "id": "issue3115",
+      "file": "pdfs/issue3115.pdf",
+      "md5": "ea10f4131202b9b8f2a6cb7770d3f185",
+      "rounds": 1,
+      "type": "eq",
+      "link": true,
+      "lastPage": 1
+    },
     {  "id": "thuluthfont-text",
        "file": "pdfs/ThuluthFeatures.pdf",
        "md5": "b7e18bf7a3d6a9c82aefa12d721072fc",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+http://mirrors.ctan.org/info/lshort/english/lshort.pdf`