Bug 1026151 - Return a default device pixel ratio if we don't have a …

…Marionette session. r=wlachance
mozilla · Jun 16, 2014 · 3e65c3f · 3e65c3f
1 parent 6d75b5c
commit 3e65c3f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/eideticker/eideticker/device.py b/src/eideticker/eideticker/device.py
@@ -558,9 +558,10 @@ def restartB2G(self):
     @property
     def devicePixelRatio(self):
         if not self._devicePixelRatio:
-            self._devicePixelRatio = self.marionette.execute_script(
-                'return window.wrappedJSObject.devicePixelRatio;') or 1
-        return self._devicePixelRatio
+            if self.marionette and self.marionette.session:
+                self._devicePixelRatio = self.marionette.execute_script(
+                    'return window.wrappedJSObject.devicePixelRatio;')
+        return self._devicePixelRatio or 1
 
 
 class B2GADB(EidetickerB2GMixin, mozdevice.DeviceManagerADB):