chrome/android: Update toolbar drawing in native.

ui/android/java/src/org/chromium/ui/resources/dynamics/ViewResourceAdapter.java

 // Copyright 2014 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.ui.resources.dynamics;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
 
 import org.chromium.base.TraceEvent;
 import org.chromium.ui.resources.Resource;
 import org.chromium.ui.resources.ResourceFactory;
 import org.chromium.ui.resources.statics.NinePatchData;
 
 /**
  * An adapter that exposes a {@link View} as a {@link DynamicResource}. In order to properly use
  * this adapter {@link ViewResourceAdapter#invalidate(Rect)} must be called when parts of the
  * {@link View} are invalidated.  For {@link ViewGroup}s the easiest way to do this is to override
  * {@link View#invalidateChildInParent(int[], Rect)}.
  */
 public class ViewResourceAdapter implements DynamicResource, OnLayoutChangeListener {
     private final View mView;
     private final Rect mDirtyRect = new Rect();
-    private final Rect mContentPadding = new Rect();
-    private final Rect mContentAperture = new Rect();
 
     private Bitmap mBitmap;
     private Rect mBitmapSize = new Rect();
 
     /**
      * Builds a {@link ViewResourceAdapter} instance around {@code view}.
      * @param view The {@link View} to expose as a {@link Resource}.
      */
     public ViewResourceAdapter(View view) {
         mView = view;
@@ skipping 28 matching lines @@
         mDirtyRect.setEmpty();
         TraceEvent.end("ViewResourceAdapter:getBitmap");
         return mBitmap;
     }
 
     @Override
     public Rect getBitmapSize() {
         return mBitmapSize;
     }
 
+    /**
+     * Override this method to create the native resource type for the generated bitmap.
+     */
     @Override
     public long createNativeResource() {
-        // TODO(khushalsagar): Fix this to create the correct native resource type.
-        // See crbug.com/700454.
-        computeContentPadding(mContentPadding);
-        computeContentAperture(mContentAperture);
-        return ResourceFactory.createNinePatchBitmapResource(mContentPadding, mContentAperture);
+        return ResourceFactory.createBitmapResource(null);
     }
 
     @Override
-    public NinePatchData getNinePatchData() {
+    public final NinePatchData getNinePatchData() {
         return null;
     }
 
     @Override
     public boolean isDirty() {
         if (mBitmap == null) mDirtyRect.set(0, 0, mView.getWidth(), mView.getHeight());
 
         return !mDirtyRect.isEmpty();
     }
 
@@ skipping 44 matching lines @@
         mView.draw(canvas);
     }
 
     /**
      * Called after {@link #capture(Canvas)}.
      */
     protected void onCaptureEnd() {
     }
 
     /**
-     * Gives overriding classes the chance to specify a different content padding.
-     * @param outContentPadding The resulting content padding.
-     */
-    protected void computeContentPadding(Rect outContentPadding) {
-        outContentPadding.set(0, 0, mView.getWidth(), mView.getHeight());
-    }
-
-    /**
-     * Gives overriding classes the chance to specify a different content aperture.
-     * @param outContentAperture The resulting content aperture.
-     */
-    protected void computeContentAperture(Rect outContentAperture) {
-        outContentAperture.set(0, 0, mView.getWidth(), mView.getHeight());
-    }
-
-    /**
      * @return Whether |mBitmap| is corresponding to |mView| or not.
      */
     private boolean validateBitmap() {
         int viewWidth = mView.getWidth();
         int viewHeight = mView.getHeight();
         boolean isEmpty = viewWidth == 0 || viewHeight == 0;
         if (isEmpty) {
             viewWidth = 1;
             viewHeight = 1;
         }
         if (mBitmap != null
                 && (mBitmap.getWidth() != viewWidth || mBitmap.getHeight() != viewHeight)) {
             mBitmap.recycle();
             mBitmap = null;
         }
 
         if (mBitmap == null) {
             mBitmap = Bitmap.createBitmap(viewWidth, viewHeight, Bitmap.Config.ARGB_8888);
             mBitmap.setHasAlpha(true);
             mDirtyRect.set(0, 0, viewWidth, viewHeight);
             mBitmapSize.set(0, 0, mBitmap.getWidth(), mBitmap.getHeight());
         }
 
         return !isEmpty;
     }
 }