| Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java
|
| index 64dfd767b5397f8797ad6d0ab7e60635c65170e2..3caff2daf9e4444023385245b622f0b65da73f72 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java
|
| @@ -10,6 +10,7 @@ import android.graphics.Bitmap;
|
| import android.text.TextUtils;
|
| import android.util.SparseArray;
|
|
|
| +import org.chromium.base.ApiCompatibilityUtils;
|
| import org.chromium.base.annotations.CalledByNative;
|
| import org.chromium.base.annotations.JNINamespace;
|
| import org.chromium.chrome.R;
|
| @@ -31,8 +32,6 @@ import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
|
| */
|
| @JNINamespace("android")
|
| public class LayerTitleCache implements TitleCache {
|
| - private static int sNextResourceId = 1;
|
| -
|
| private final Context mContext;
|
| private TabModelSelector mTabModelSelector;
|
|
|
| @@ -231,8 +230,10 @@ public class LayerTitleCache implements TitleCache {
|
| }
|
|
|
| private class Title {
|
| - private final BitmapDynamicResource mFavicon = new BitmapDynamicResource(sNextResourceId++);
|
| - private final BitmapDynamicResource mTitle = new BitmapDynamicResource(sNextResourceId++);
|
| + private final BitmapDynamicResource mFavicon =
|
| + new BitmapDynamicResource(ApiCompatibilityUtils.generateViewId());
|
| + private final BitmapDynamicResource mTitle =
|
| + new BitmapDynamicResource(ApiCompatibilityUtils.generateViewId());
|
|
|
| // We don't want to override updated favicon (e.g. from Tab#onFaviconAvailable) with one
|
| // fetched from history. You can set this to true / false to control that.
|
|
|