Remove redundant getDisplayportOrigin method from ViewportMetrics; use getOrigin instead

mobile/android/base/GeckoApp.java

@@ -1518,7 +1518,7 @@ abstract public class GeckoApp
             return;
         }
 
-        PointF origin = metrics.getDisplayportOrigin();
+        PointF origin = metrics.getOrigin();
         x = x + (int)origin.x;
         y = y + (int)origin.y;
 
@@ -2794,7 +2794,7 @@ class PluginLayoutParams extends AbsoluteLayout.LayoutParams
     }
 
     public void reset(int aX, int aY, int aWidth, int aHeight, ViewportMetrics aViewport) {
-        PointF origin = aViewport.getDisplayportOrigin();
+        PointF origin = aViewport.getOrigin();
 
         x = mOriginalX = aX + (int)origin.x;
         y = mOriginalY = aY + (int)origin.y;
@@ -2820,8 +2820,8 @@ class PluginLayoutParams extends AbsoluteLayout.LayoutParams
     }
 
     public void reposition(ViewportMetrics viewport) {
-        PointF targetOrigin = viewport.getDisplayportOrigin();
-        PointF originalOrigin = mOriginalViewport.getDisplayportOrigin();
+        PointF targetOrigin = viewport.getOrigin();
+        PointF originalOrigin = mOriginalViewport.getOrigin();
 
         Point offset = new Point(Math.round(originalOrigin.x - targetOrigin.x),
                                  Math.round(originalOrigin.y - targetOrigin.y));

mobile/android/base/gfx/GeckoLayerClient.java

@@ -176,7 +176,7 @@ public class GeckoLayerClient implements GeckoEventListener,
                                                          currentBestOrigin.x + width, currentBestOrigin.y + height));
 
             // Second, store Gecko's displayport.
-            PointF currentOrigin = mNewGeckoViewport.getDisplayportOrigin();
+            PointF currentOrigin = mNewGeckoViewport.getOrigin();
             bufferRect = RectUtils.round(new RectF(currentOrigin.x, currentOrigin.y,
                                                    currentOrigin.x + width, currentOrigin.y + height));
 
@@ -242,8 +242,8 @@ public class GeckoLayerClient implements GeckoEventListener,
         mGeckoViewport = mNewGeckoViewport;
         mGeckoViewport.setSize(viewportSize);
 
-        PointF displayportOrigin = mGeckoViewport.getDisplayportOrigin();
-        mTileLayer.setOrigin(PointUtils.round(displayportOrigin));
+        PointF origin = mGeckoViewport.getOrigin();
+        mTileLayer.setOrigin(PointUtils.round(origin));
         mTileLayer.setResolution(mGeckoViewport.getZoomFactor());
 
         // Set the new origin and resolution instantly.

mobile/android/base/gfx/PlaceholderLayerClient.java

@@ -89,7 +89,7 @@ public class PlaceholderLayerClient {
 
         tileLayer.beginTransaction();   // calling thread irrelevant; nobody else has a ref to tileLayer yet
         try {
-            tileLayer.setOrigin(PointUtils.round(mViewport.getDisplayportOrigin()));
+            tileLayer.setOrigin(PointUtils.round(mViewport.getOrigin()));
         } finally {
             tileLayer.endTransaction();
         }

mobile/android/base/gfx/ViewportMetrics.java

@@ -97,11 +97,6 @@ public class ViewportMetrics {
         return new PointF(mViewportRect.left, mViewportRect.top);
     }
 
-    public PointF getDisplayportOrigin() {
-        return new PointF(mViewportRect.left,
-                          mViewportRect.top);
-    }
-
     public FloatSize getSize() {
         return new FloatSize(mViewportRect.width(), mViewportRect.height());
     }