Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Side by Side Diff: chrome/browser/android/compositor/layer/tab_layer.cc

Issue 986683002: [Android] Allow specifying the progress component of the toolbar as a separate texture. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Javadoc fix Created 5 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/compositor/layer/tab_layer.h" 5 #include "chrome/browser/android/compositor/layer/tab_layer.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "cc/layers/image_layer.h" 8 #include "cc/layers/image_layer.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/layers/layer_lists.h" 10 #include "cc/layers/layer_lists.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 177
178 gfx::Size toolbar_impact_size(toolbar_padding.size().width(), 178 gfx::Size toolbar_impact_size(toolbar_padding.size().width(),
179 toolbar_padding.size().height()); 179 toolbar_padding.size().height());
180 if (!show_toolbar || back_visible) 180 if (!show_toolbar || back_visible)
181 toolbar_impact_size.SetSize(0, 0); 181 toolbar_impact_size.SetSize(0, 0);
182 const float close_btn_effective_width = close_btn_width * close_alpha; 182 const float close_btn_effective_width = close_btn_width * close_alpha;
183 183
184 //---------------------------------------------------------------------------- 184 //----------------------------------------------------------------------------
185 // Update Resource Ids For Layers That Impact Layout 185 // Update Resource Ids For Layers That Impact Layout
186 //---------------------------------------------------------------------------- 186 //----------------------------------------------------------------------------
187 toolbar_layer_->PushResource(toolbar_resource, anonymize_toolbar, incognito_, 187 toolbar_layer_->PushResource(toolbar_resource,
188 nullptr,
189 anonymize_toolbar,
190 incognito_,
188 false); 191 false);
189 192
190 //---------------------------------------------------------------------------- 193 //----------------------------------------------------------------------------
191 // Compute Alpha and Visibility 194 // Compute Alpha and Visibility
192 //---------------------------------------------------------------------------- 195 //----------------------------------------------------------------------------
193 border_alpha *= alpha; 196 border_alpha *= alpha;
194 contour_alpha *= alpha; 197 contour_alpha *= alpha;
195 shadow_alpha *= alpha; 198 shadow_alpha *= alpha;
196 close_alpha *= alpha; 199 close_alpha *= alpha;
197 toolbar_alpha *= alpha; 200 toolbar_alpha *= alpha;
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 title_->AddChild(layer); 577 title_->AddChild(layer);
575 } 578 }
576 } 579 }
577 580
578 if (title) 581 if (title)
579 title->SetUIResourceIds(); 582 title->SetUIResourceIds();
580 } 583 }
581 584
582 } // namespace android 585 } // namespace android
583 } // namespace chrome 586 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698