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

Unified Diff: chrome/browser/android/compositor/layer/tab_layer.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 years, 7 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
Index: chrome/browser/android/compositor/layer/tab_layer.cc
diff --git a/chrome/browser/android/compositor/layer/tab_layer.cc b/chrome/browser/android/compositor/layer/tab_layer.cc
index 7061166f6197afbae738bd39dd523ddf93c966c1..de8c2bef1c97e7c910af57aade7939c69f451adb 100644
--- a/chrome/browser/android/compositor/layer/tab_layer.cc
+++ b/chrome/browser/android/compositor/layer/tab_layer.cc
@@ -530,16 +530,21 @@ TabLayer::TabLayer(bool incognito,
: incognito_(incognito),
resource_manager_(resource_manager),
layer_title_cache_(layer_title_cache),
- layer_(cc::Layer::Create()),
+ layer_(cc::Layer::Create(ContentLayer::ContentLayerSettings())),
toolbar_layer_(ToolbarLayer::Create()),
- title_(cc::Layer::Create()),
+ title_(cc::Layer::Create(ContentLayer::ContentLayerSettings())),
content_(ContentLayer::Create(tab_content_manager)),
- padding_(cc::SolidColorLayer::Create()),
- close_button_(cc::UIResourceLayer::Create()),
- front_border_(cc::NinePatchLayer::Create()),
- contour_shadow_(cc::NinePatchLayer::Create()),
- shadow_(cc::NinePatchLayer::Create()),
- back_logo_(cc::UIResourceLayer::Create()),
+ padding_(
+ cc::SolidColorLayer::Create(ContentLayer::ContentLayerSettings())),
+ close_button_(
+ cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+ front_border_(
+ cc::NinePatchLayer::Create(ContentLayer::ContentLayerSettings())),
+ contour_shadow_(
+ cc::NinePatchLayer::Create(ContentLayer::ContentLayerSettings())),
+ shadow_(cc::NinePatchLayer::Create(ContentLayer::ContentLayerSettings())),
+ back_logo_(
+ cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
brightness_(1.f) {
layer_->AddChild(shadow_);
layer_->AddChild(contour_shadow_);

Powered by Google App Engine
This is Rietveld 408576698