chrome/android: Update toolbar drawing in native.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarControlContainer.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.toolbar;
 
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.Region;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewStub;
 import android.widget.FrameLayout;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandler;
+import org.chromium.chrome.browser.compositor.resources.ResourceFactory;
 import org.chromium.chrome.browser.contextualsearch.SwipeRecognizer;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.ClipDrawableProgressBar.DrawingInfo;
 import org.chromium.chrome.browser.widget.ControlContainer;
 import org.chromium.chrome.browser.widget.ToolbarProgressBar;
 import org.chromium.chrome.browser.widget.ViewResourceFrameLayout;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
 
 /**
@@ skipping 123 matching lines @@
         }
 
         @Override
         protected boolean isReadyForCapture() {
             return mReadyForBitmapCapture;
         }
     }
 
     private static class ToolbarViewResourceAdapter extends ViewResourceAdapter {
         private final int[] mTempPosition = new int[2];
+        private final Rect mLocationBarRect = new Rect();
+        private final Rect mToolbarRect = new Rect();
         private final View mToolbarContainer;
 
         private Toolbar mToolbar;
-        private int mToolbarActualHeightPx;
+        private int mToolbarHeightPx;

[mdjones, 2017/03/16 21:01:47]

This can be pulled directly from toolbar now.

[Khushal, 2017/03/17 23:02:58]

Done.

         private int mTabStripHeightPx;
 
         /** Builds the resource adapter for the toolbar. */
         public ToolbarViewResourceAdapter(View toolbarContainer) {
             super(toolbarContainer);
             mToolbarContainer = toolbarContainer;
         }
 
         /**
          * Set the toolbar after it has been dynamically inflated.
          * @param toolbar The browser's toolbar.
          */
         public void setToolbar(Toolbar toolbar) {
             mToolbar = toolbar;
             int containerHeightResId = R.dimen.control_container_height;
             if (mToolbar instanceof CustomTabToolbar) {
                 containerHeightResId = R.dimen.custom_tabs_control_container_height;
             }
-            mToolbarActualHeightPx = mToolbarContainer.getResources().getDimensionPixelSize(
-                    containerHeightResId);
+            int toolbarHeightMinusShadow =
+                    mToolbarContainer.getResources().getDimensionPixelSize(containerHeightResId);
             mTabStripHeightPx = mToolbarContainer.getResources().getDimensionPixelSize(
                     R.dimen.tab_strip_height);
+            mToolbarHeightPx = toolbarHeightMinusShadow - mTabStripHeightPx;
         }
 
         /**
          * Force this resource to be recaptured in full, ignoring the checks
          * {@link #invalidate(Rect)} does.
          */
         public void forceInvalidate() {
             super.invalidate(null);
         }
 
@@ skipping 21 matching lines @@
 
         @Override
         protected void onCaptureEnd() {
             mToolbar.setTextureCaptureMode(false);
             // Forcing a texture capture should only be done for one draw. Turn off forced
             // texture capture.
             mToolbar.setForceTextureCapture(false);
         }
 
         @Override
-        protected void computeContentPadding(Rect outContentPadding) {
-            outContentPadding.set(0, mTabStripHeightPx, mToolbarContainer.getWidth(),
-                    mToolbarActualHeightPx);
-        }
+        public long createNativeResource() {
+            mToolbar.getPositionRelativeToContainer(mToolbarContainer, mTempPosition);
+            mToolbarRect.set(mTempPosition[0], mTempPosition[1], mToolbarContainer.getWidth(),
+                    mTempPosition[1] + mToolbarHeightPx);
 
-        @Override
-        protected void computeContentAperture(Rect outContentAperture) {
-            mToolbar.getLocationBarContentRect(outContentAperture);
-            mToolbar.getPositionRelativeToContainer(mToolbarContainer, mTempPosition);
-            outContentAperture.offset(mTempPosition[0], mTempPosition[1]);
+            mToolbar.getLocationBarContentRect(mLocationBarRect);
+            mLocationBarRect.offset(mTempPosition[0], mTempPosition[1]);
+
+            int shadowHeight = mToolbarContainer.getHeight() - mToolbarHeightPx - mTabStripHeightPx;
+            return ResourceFactory.createToolbarContainerResource(
+                    mToolbarRect, mLocationBarRect, shadowHeight);
         }
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         // Don't eat the event if we don't have a handler.
         if (mSwipeHandler == null) return false;
 
         // If we have ACTION_DOWN in this context, that means either no child consumed the event or
         // this class is the top UI at the event position. Then, we don't need to feed the event to
@@ skipping 25 matching lines @@
 
         @Override
         public boolean shouldRecognizeSwipe(MotionEvent e1, MotionEvent e2) {
             if (isOnTabStrip(e1)) return false;
             if (mToolbar.shouldIgnoreSwipeGesture()) return false;
             if (UiUtils.isKeyboardShowing(getContext(), ToolbarControlContainer.this)) return false;
             return true;
         }
     }
 }