Simplify content_layer attachment and viewporting logic.

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
index 20f5212995ae7e1264198811990555aee3c03a21..647c584fd7acbe72c570dbeed9b5a6ead70cf292 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
@@ -4,8 +4,6 @@
 
 package org.chromium.chrome.browser.compositor.scene_layer;
 
-import android.graphics.RectF;
-
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.browser.compositor.LayerTitleCache;
 import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
@@ -37,7 +35,7 @@ public class StaticTabSceneLayer extends SceneLayer {
      * @param fullscreenManager The FullscreenManager.
      * @param layoutTab         The LayoutTab.
      */
-    public void update(float dpToPx, RectF contentViewport, LayerTitleCache layerTitleCache,
+    public void update(float dpToPx, LayerTitleCache layerTitleCache,
             TabContentManager tabContentManager, ChromeFullscreenManager fullscreenManager,
             LayoutTab layoutTab) {
         if (layoutTab == null) {
@@ -46,16 +44,13 @@ public class StaticTabSceneLayer extends SceneLayer {
 
         float contentOffset =
                 fullscreenManager != null ? fullscreenManager.getContentOffset() : 0.f;
+        float x = layoutTab.getRenderX() * dpToPx;
+        float y = contentOffset + layoutTab.getRenderY() * dpToPx;
 
-        // TODO(dtrainor, clholgat): remove "* dpToPx" once the native part is fully supporting dp.
-        nativeUpdateTabLayer(mNativePtr, contentViewport.left, contentViewport.top,
-                contentViewport.width(), contentViewport.height(), tabContentManager,
-                layoutTab.getId(), mResToolbarControlContainer, layoutTab.canUseLiveTexture(),
-                layoutTab.getBackgroundColor(), layoutTab.getRenderX() * dpToPx,
-                layoutTab.getRenderY() * dpToPx, layoutTab.getScaledContentWidth() * dpToPx,
-                layoutTab.getScaledContentHeight() * dpToPx, contentOffset,
-                layoutTab.getStaticToViewBlend(), layoutTab.getSaturation(),
-                layoutTab.getBrightness());
+        nativeUpdateTabLayer(mNativePtr, tabContentManager, layoutTab.getId(),
+                mResToolbarControlContainer, layoutTab.canUseLiveTexture(),
+                layoutTab.getBackgroundColor(), x, y, layoutTab.getStaticToViewBlend(),
+                layoutTab.getSaturation(), layoutTab.getBrightness());
     }
 
     @Override
@@ -73,10 +68,8 @@ public class StaticTabSceneLayer extends SceneLayer {
     }
 
     private native long nativeInit();
-    private native void nativeUpdateTabLayer(long nativeStaticTabSceneLayer, float contentViewportX,
-            float contentViewportY, float contentViewportWidth, float contentViewportHeight,
+    private native void nativeUpdateTabLayer(long nativeStaticTabSceneLayer,
             TabContentManager tabContentManager, int id, int toolbarResourceId,
-            boolean canUseLiveLayer, int backgroundColor, float x, float y, float width,
-            float height, float contentOffsetY, float staticToViewBlend, float saturation,
-            float brightness);
+            boolean canUseLiveLayer, int backgroundColor, float x, float y, float staticToViewBlend,
+            float saturation, float brightness);
 }