android: Fix snapshot height by including toolbar offset

content/public/android/java/src/org/chromium/content/browser/ContentView.java

 // Copyright 2012 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.content.browser;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Rect;
@@ skipping 11 matching lines @@
 
 /**
  * The containing view for {@link ContentViewCore} that exists in the Android UI hierarchy and
  * exposes the various {@link View} functionality to it.
  */
 public class ContentView extends FrameLayout
         implements ContentViewCore.InternalAccessDelegate {
 
     protected final ContentViewCore mContentViewCore;
 
-    private final int[] mLocationInWindow = new int[2];
-
     /**
      * Creates an instance of a ContentView.
      * @param context The Context the view is running in, through which it can
      *                access the current theme, resources, etc.
      * @param cvc A pointer to the content view core managing this content view.
      * @return A ContentView instance.
      */
     public static ContentView newInstance(Context context, ContentViewCore cvc) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
             return new ContentView(context, cvc);
@@ skipping 30 matching lines @@
 
     @Override
     protected void onSizeChanged(int w, int h, int ow, int oh) {
         TraceEvent.begin();
         super.onSizeChanged(w, h, ow, oh);
         mContentViewCore.onSizeChanged(w, h, ow, oh);
         TraceEvent.end();
     }
 
     @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        super.onLayout(changed, left, top, right, bottom);
-        if (changed) {
-            getLocationInWindow(mLocationInWindow);
-            mContentViewCore.onLocationInWindowChanged(mLocationInWindow[0], mLocationInWindow[1]);
-        }
-    }
-
-    @Override
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
         return mContentViewCore.onCreateInputConnection(outAttrs);
     }
 
     @Override
     public boolean onCheckIsTextEditor() {
         return mContentViewCore.onCheckIsTextEditor();
     }
 
     @Override
@@ skipping 186 matching lines @@
 
     @Override
     public boolean super_awakenScrollBars(int startDelay, boolean invalidate) {
         return super.awakenScrollBars(startDelay, invalidate);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////
     //                End Implementation of ContentViewCore.InternalAccessDelegate               //
     ///////////////////////////////////////////////////////////////////////////////////////////////
 }