When taking screenshot check window.document.body dimensions only if …

…it is not null. Fixes issue 5130
nimeacuerdo · Feb 27, 2013 · ba2f5ff · ba2f5ff
1 parent 1e74123
commit ba2f5ff
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/javascript/firefox-driver/js/screenshooter.js b/javascript/firefox-driver/js/screenshooter.js
@@ -31,10 +31,14 @@ fxdriver.screenshot.grab = function(window) {
     canvas.style.display = 'none';
     documentElement.appendChild(canvas);
   }
-  var width =
-      Math.max(documentElement.scrollWidth, document.body.scrollWidth);
-  var height =
-      Math.max(documentElement.scrollHeight, document.body.scrollHeight);
+  var width = documentElement.scrollWidth;
+  if (document.body && document.body.scrollWidth > width) {
+    width = document.body.scrollWidth;
+  }
+  var height = documentElement.scrollHeight;
+  if (document.body && document.body.scrollHeight > height) {
+    height = document.body.scrollHeight;
+  }
   canvas.width = width;
   canvas.height = height;
   var context = canvas.getContext('2d');