Merge pull request mozilla#1967 from brendandahl/deatched-dom

yurydelendik · yurydelendik · commit e17d828b64a1 · 2012-08-08T12:38:08.000-07:00
Cleanup references to dom elements.
diff --git a/src/canvas.js b/src/canvas.js
@@ -1258,7 +1258,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
   return CanvasGraphics;
 })();
 
-if (!isWorker) {
+function checkPutBinaryImageDataCompatibility() {
   // Feature detection if the browser can use an Uint8Array directly as imgData.
   var canvas = document.createElement('canvas');
   canvas.width = 1;
@@ -1293,3 +1293,6 @@ if (!isWorker) {
       };
   }
 }
+if (!isWorker) {
+  checkPutBinaryImageDataCompatibility();
+}
diff --git a/web/viewer.js b/web/viewer.js
@@ -1704,6 +1704,7 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
       if (textDivs.length === 0) {
         clearInterval(renderTimer);
         renderingDone = true;
+        self.textLayerDiv = textLayerDiv = canvas = ctx = null;
         return;
       }
       var textDiv = textDivs.shift();

Original file line number	Diff line number	Diff line change
`@@ -1258,7 +1258,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {`
`1258`	`1258`	`return CanvasGraphics;`
`1259`	`1259`	`})();`
`1260`	`1260`
`1261`		`-if (!isWorker) {`
	`1261`	`+function checkPutBinaryImageDataCompatibility() {`
`1262`	`1262`	`// Feature detection if the browser can use an Uint8Array directly as imgData.`
`1263`	`1263`	`var canvas = document.createElement('canvas');`
`1264`	`1264`	`canvas.width = 1;`
`@@ -1293,3 +1293,6 @@ if (!isWorker) {`
`1293`	`1293`	`};`
`1294`	`1294`	`}`
`1295`	`1295`	`}`
	`1296`	`+if (!isWorker) {`
	`1297`	`+ checkPutBinaryImageDataCompatibility();`
	`1298`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1704,6 +1704,7 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {`
`1704`	`1704`	`if (textDivs.length === 0) {`
`1705`	`1705`	`clearInterval(renderTimer);`
`1706`	`1706`	`renderingDone = true;`
	`1707`	`+ self.textLayerDiv = textLayerDiv = canvas = ctx = null;`
`1707`	`1708`	`return;`
`1708`	`1709`	`}`
`1709`	`1710`	`var textDiv = textDivs.shift();`