Index: chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc |
diff --git a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc |
index cc6b906bf08d524a9bce97599271197fab65b026..808a0c025bab83d5104b97a47f6f8b10368a8e5f 100644 |
--- a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc |
+++ b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc |
@@ -86,62 +86,62 @@ void TabListSceneLayer::UpdateLayer( |
own_tree_->SetBounds(gfx::Size(viewport_width, viewport_height)); |
} |
-void TabListSceneLayer::PutTabLayer( |
- JNIEnv* env, |
- const JavaParamRef<jobject>& jobj, |
- jint id, |
- jint toolbar_resource_id, |
- jint close_button_resource_id, |
- jint shadow_resource_id, |
- jint contour_resource_id, |
- jint back_logo_resource_id, |
- jint border_resource_id, |
- jint border_inner_shadow_resource_id, |
- jboolean can_use_live_layer, |
- jboolean browser_controls_at_bottom, |
- jint tab_background_color, |
- jint back_logo_color, |
- jboolean incognito, |
- jboolean is_portrait, |
- jfloat x, |
- jfloat y, |
- jfloat width, |
- jfloat height, |
- jfloat content_width, |
- jfloat content_height, |
- jfloat visible_content_height, |
- jfloat shadow_x, |
- jfloat shadow_y, |
- jfloat shadow_width, |
- jfloat shadow_height, |
- jfloat pivot_x, |
- jfloat pivot_y, |
- jfloat rotation_x, |
- jfloat rotation_y, |
- jfloat alpha, |
- jfloat border_alpha, |
- jfloat border_inner_shadow_alpha, |
- jfloat contour_alpha, |
- jfloat shadow_alpha, |
- jfloat close_alpha, |
- jfloat close_btn_width, |
- jfloat static_to_view_blend, |
- jfloat border_scale, |
- jfloat saturation, |
- jfloat brightness, |
- jboolean show_toolbar, |
- jint default_theme_color, |
- jint toolbar_background_color, |
- jint close_button_color, |
- jboolean anonymize_toolbar, |
- jboolean show_tab_title, |
- jint toolbar_textbox_resource_id, |
- jint toolbar_textbox_background_color, |
- jfloat toolbar_textbox_alpha, |
- jfloat toolbar_alpha, |
- jfloat toolbar_y_offset, |
- jfloat side_border_scale, |
- jboolean inset_border) { |
+void TabListSceneLayer::PutTabLayer(JNIEnv* env, |
+ const JavaParamRef<jobject>& jobj, |
+ jint id, |
+ jint toolbar_resource_id, |
+ jint close_button_resource_id, |
+ jint shadow_resource_id, |
+ jint contour_resource_id, |
+ jint back_logo_resource_id, |
+ jint border_resource_id, |
+ jint border_inner_shadow_resource_id, |
+ jboolean can_use_live_layer, |
+ jboolean can_use_static_layer, |
+ jboolean browser_controls_at_bottom, |
+ jint tab_background_color, |
+ jint back_logo_color, |
+ jboolean incognito, |
+ jboolean is_portrait, |
+ jfloat x, |
+ jfloat y, |
+ jfloat width, |
+ jfloat height, |
+ jfloat content_width, |
+ jfloat content_height, |
+ jfloat visible_content_height, |
+ jfloat shadow_x, |
+ jfloat shadow_y, |
+ jfloat shadow_width, |
+ jfloat shadow_height, |
+ jfloat pivot_x, |
+ jfloat pivot_y, |
+ jfloat rotation_x, |
+ jfloat rotation_y, |
+ jfloat alpha, |
+ jfloat border_alpha, |
+ jfloat border_inner_shadow_alpha, |
+ jfloat contour_alpha, |
+ jfloat shadow_alpha, |
+ jfloat close_alpha, |
+ jfloat close_btn_width, |
+ jfloat static_to_view_blend, |
+ jfloat border_scale, |
+ jfloat saturation, |
+ jfloat brightness, |
+ jboolean show_toolbar, |
+ jint default_theme_color, |
+ jint toolbar_background_color, |
+ jint close_button_color, |
+ jboolean anonymize_toolbar, |
+ jboolean show_tab_title, |
+ jint toolbar_textbox_resource_id, |
+ jint toolbar_textbox_background_color, |
+ jfloat toolbar_textbox_alpha, |
+ jfloat toolbar_alpha, |
+ jfloat toolbar_y_offset, |
+ jfloat side_border_scale, |
+ jboolean inset_border) { |
scoped_refptr<TabLayer> layer; |
auto iter = tab_map_.find(id); |
if (iter != tab_map_.end()) { |
@@ -162,21 +162,21 @@ void TabListSceneLayer::PutTabLayer( |
DCHECK(layer); |
if (layer) { |
layer->SetProperties( |
- id, can_use_live_layer, browser_controls_at_bottom, |
- toolbar_resource_id, close_button_resource_id, |
- shadow_resource_id, contour_resource_id, back_logo_resource_id, |
- border_resource_id, border_inner_shadow_resource_id, |
- tab_background_color, back_logo_color, is_portrait, x, y, width, height, |
- shadow_x, shadow_y, shadow_width, shadow_height, pivot_x, pivot_y, |
- rotation_x, rotation_y, alpha, border_alpha, border_inner_shadow_alpha, |
- contour_alpha, shadow_alpha, close_alpha, border_scale, saturation, |
- brightness, close_btn_width, static_to_view_blend, content_width, |
- content_height, content_width, visible_content_height, show_toolbar, |
- default_theme_color, toolbar_background_color, |
- close_button_color, anonymize_toolbar, show_tab_title, |
- toolbar_textbox_resource_id, toolbar_textbox_background_color, |
- toolbar_textbox_alpha, toolbar_alpha, toolbar_y_offset, |
- side_border_scale, inset_border); |
+ id, can_use_live_layer, can_use_static_layer, |
+ browser_controls_at_bottom, toolbar_resource_id, |
+ close_button_resource_id, shadow_resource_id, contour_resource_id, |
+ back_logo_resource_id, border_resource_id, |
+ border_inner_shadow_resource_id, tab_background_color, back_logo_color, |
+ is_portrait, x, y, width, height, shadow_x, shadow_y, shadow_width, |
+ shadow_height, pivot_x, pivot_y, rotation_x, rotation_y, alpha, |
+ border_alpha, border_inner_shadow_alpha, contour_alpha, shadow_alpha, |
+ close_alpha, border_scale, saturation, brightness, close_btn_width, |
+ static_to_view_blend, content_width, content_height, content_width, |
+ visible_content_height, show_toolbar, default_theme_color, |
+ toolbar_background_color, close_button_color, anonymize_toolbar, |
+ show_tab_title, toolbar_textbox_resource_id, |
+ toolbar_textbox_background_color, toolbar_textbox_alpha, toolbar_alpha, |
+ toolbar_y_offset, side_border_scale, inset_border); |
} |
gfx::RectF self(own_tree_->position(), gfx::SizeF(own_tree_->bounds())); |