Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java |
index f639f1a6727cdabf993489cc4223285f9f9ff6a5..fcaa73e73142ec91c21d94e905f332f9429ecf51 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java |
@@ -61,8 +61,10 @@ public class TabListSceneLayer extends SceneLayer { |
? ApiCompatibilityUtils.getColor(res, R.color.incognito_primary_color) |
: ApiCompatibilityUtils.getColor(res, R.color.default_primary_color); |
+ int defaultCloseButtonColor = ColorUtils.getThemedAssetColor(defaultThemeColor, |
+ t.isIncognito()); |
int closeButtonColor = ColorUtils.getThemedAssetColor(t.getToolbarBackgroundColor(), |
- t.isIncognito()); |
+ t.isIncognito()); |
int borderColorResource = |
t.isIncognito() ? R.color.tab_back_incognito : R.color.tab_back; |
@@ -88,10 +90,14 @@ public class TabListSceneLayer extends SceneLayer { |
t.getShadowOpacity() * decoration, t.getBorderCloseButtonAlpha() * decoration, |
LayoutTab.CLOSE_BUTTON_WIDTH_DP * dpToPx, t.getStaticToViewBlend(), |
t.getBorderScale(), t.getSaturation(), t.getBrightness(), t.showToolbar(), |
- defaultThemeColor, t.getToolbarBackgroundColor(), closeButtonColor, |
+ defaultThemeColor, t.getToolbarBackgroundColor(), |
+ defaultCloseButtonColor, closeButtonColor, |
t.anonymizeToolbar(), R.drawable.textbox, t.getTextBoxBackgroundColor(), |
t.getTextBoxAlpha(), t.getToolbarAlpha(), t.getToolbarYOffset() * dpToPx, |
- t.getSideBorderScale(), true, t.insetBorderVertical()); |
+ t.getSideBorderScale(), true, t.insetBorderVertical(), |
+ t.getTitleLayerNeedsUpdate()); |
+ |
+ t.setTitleLayerNeedsUpdate(false); |
} |
nativeFinishBuildingFrame(mNativePtr); |
} |
@@ -139,8 +145,9 @@ public class TabListSceneLayer extends SceneLayer { |
float borderInnerShadowAlpha, float contourAlpha, float shadowAlpha, float closeAlpha, |
float closeBtnWidth, float staticToViewBlend, float borderScale, float saturation, |
float brightness, boolean showToolbar, int defaultThemeColor, |
- int toolbarBackgroundColor, int closeButtonColor, boolean anonymizeToolbar, |
- int toolbarTextBoxResource, int toolbarTextBoxBackgroundColor, |
+ int toolbarBackgroundColor, int defaultCloseButtonColor, int closeButtonColor, |
+ boolean anonymizeToolbar, int toolbarTextBoxResource, int toolbarTextBoxBackgroundColor, |
float toolbarTextBoxAlpha, float toolbarAlpha, float toolbarYOffset, |
- float sideBorderScale, boolean attachContent, boolean insetVerticalBorder); |
+ float sideBorderScale, boolean attachContent, boolean insetVerticalBorder, |
+ boolean titleLayerNeedsUpdate); |
} |