Bug 1180295 - Remove the margins information from ImmutableViewportMetrics. r=rbarker

This commit is contained in:
Kartikaya Gupta
2015-08-18 14:27:20 -04:00
parent 5c30203c3a
commit 3aa2e96ea3
7 changed files with 36 additions and 128 deletions

View File

@@ -1087,7 +1087,7 @@ class JavaPanZoomController
}
/* Now we pan to the right origin. */
viewportMetrics = viewportMetrics.clampWithMargins();
viewportMetrics = viewportMetrics.clamp();
return viewportMetrics;
}
@@ -1101,7 +1101,7 @@ class JavaPanZoomController
@Override
protected float getPageStart() { return getMetrics().pageRectLeft; }
@Override
protected float getPageLength() { return getMetrics().getPageWidthWithMargins(); }
protected float getPageLength() { return getMetrics().getPageWidth(); }
@Override
protected float getVisibleEndOfLayerView() {
return mTarget.getVisibleEndOfLayerView().x;
@@ -1129,7 +1129,7 @@ class JavaPanZoomController
@Override
protected float getPageStart() { return getMetrics().pageRectTop; }
@Override
protected float getPageLength() { return getMetrics().getPageHeightWithMargins(); }
protected float getPageLength() { return getMetrics().getPageHeight(); }
@Override
protected float getVisibleEndOfLayerView() {
return mTarget.getVisibleEndOfLayerView().y;