chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java - Issue 1417353003: Move UrlBar background drawing to CC.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

Issue 1417353003: Move UrlBar background drawing to CC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add javadoc Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/util/ColorUtils.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

index c140d73cb2a9f7669eda6b0998fd3fb0f03e8866..e8aac6b6b76a9f3e3243624e39cc7ba5afcf0e0e 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java

@@ -1043,7 +1043,8 @@ public class ToolbarPhone extends ToolbarLayout

}

mLocationBarBackground.setAlpha(backgroundAlpha);

- if (mPhoneLocationBar.getAlpha() > 0 || mForceDrawLocationBarBackground) {

+ if ((mPhoneLocationBar.getAlpha() > 0 || mForceDrawLocationBarBackground)

+ && !mTextureCaptureMode) {

mLocationBarBackground.setBounds(

mUrlViewportBounds.left + mLocationBarBackgroundOffset.left,

mUrlViewportBounds.top + mLocationBarBackgroundOffset.top,

@@ -1171,7 +1172,13 @@ public class ToolbarPhone extends ToolbarLayout

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