Move UrlBar background drawing to CC.

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.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.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 1025 matching lines @@
                         (int) (Math.pow(mPhoneLocationBar.getAlpha(), 3) * backgroundAlpha);
             } else if (getToolbarDataProvider().isUsingBrandColor()
                     && !mBrandColorTransitionActive) {
                 int unfocusedAlpha = mUnfocusedLocationBarUsesTransparentBg
                         ? LOCATION_BAR_TRANSPARENT_BACKGROUND_ALPHA : 255;
                 backgroundAlpha =
                         (int) (mUrlExpansionPercent * (255 - unfocusedAlpha) + unfocusedAlpha);
             }
             mLocationBarBackground.setAlpha(backgroundAlpha);
 
-            if (mPhoneLocationBar.getAlpha() > 0 || mForceDrawLocationBarBackground) {
+            if ((mPhoneLocationBar.getAlpha() > 0 || mForceDrawLocationBarBackground)
+                    && !mTextureCaptureMode) {
                 mLocationBarBackground.setBounds(
                         mUrlViewportBounds.left + mLocationBarBackgroundOffset.left,
                         mUrlViewportBounds.top + mLocationBarBackgroundOffset.top,
                         mUrlViewportBounds.right + mLocationBarBackgroundOffset.right,
                         mUrlViewportBounds.bottom + mLocationBarBackgroundOffset.bottom);
                 mLocationBarBackground.draw(canvas);
             }
 
             locationBarClipLeft = mUrlViewportBounds.left + mPhoneLocationBar.getPaddingLeft()
                     + mLocationBarBackgroundOffset.left;
@@ skipping 107 matching lines @@
         }
     }
 
     @Override
     public void getLocationBarContentRect(Rect outRect) {
         if (isLocationBarShownInNTP() && !isFocused()) {
             outRect.setEmpty();
             return;
         }
 
-        super.getLocationBarContentRect(outRect);
+        Rect padding = new Rect();
+        mLocationBarBackground.getPadding(padding);
+
+        outRect.set(mUrlViewportBounds.left + mLocationBarBackgroundOffset.left + padding.left,
+                mUrlViewportBounds.top + mLocationBarBackgroundOffset.top + padding.top,
+                mUrlViewportBounds.right + mLocationBarBackgroundOffset.right - padding.right,
+                mUrlViewportBounds.bottom + mLocationBarBackgroundOffset.bottom - padding.bottom);
     }
 
     @Override
     protected void onHomeButtonUpdate(boolean homeButtonEnabled) {
         if (homeButtonEnabled) {
             mHomeButton.setVisibility(urlHasFocus() || mInTabSwitcherMode ? INVISIBLE : VISIBLE);
             if (!mBrowsingModeViews.contains(mHomeButton)) {
                 mBrowsingModeViews.add(mHomeButton);
             }
         } else {
@@ skipping 733 matching lines @@
 
         getMenuButton().setVisibility(shouldShowMenuButton() ? View.VISIBLE : View.GONE);
     }
 
     @Override
     public LocationBar getLocationBar() {
         return mPhoneLocationBar;
     }
 }