Bug 708683 - Fix NaN viewport values. r=pcwalton

The zero page width and height values were
causing the zoom scale to go to Infinity, introducing
all sorts of badness in the viewport values.
This commit is contained in:
Kartikaya Gupta 2011-12-09 22:57:57 -05:00
parent ea12c1c403
commit 77c643ef3e

View File

@ -811,11 +811,11 @@ public class PanZoomController
RectF viewport = viewportMetrics.getViewport();
float minZoomFactor = 0.0f;
if (viewport.width() > pageSize.width) {
if (viewport.width() > pageSize.width && pageSize.width > 0) {
float scaleFactor = viewport.width() / pageSize.width;
minZoomFactor = (float)Math.max(minZoomFactor, zoomFactor * scaleFactor);
}
if (viewport.height() > pageSize.height) {
if (viewport.height() > pageSize.height && pageSize.height > 0) {
float scaleFactor = viewport.height() / pageSize.height;
minZoomFactor = (float)Math.max(minZoomFactor, zoomFactor * scaleFactor);
}