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

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

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid
Patch Set: Rebase. Created 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_handle_layer.h" 5 #include "chrome/browser/android/compositor/layer/tab_handle_layer.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "cc/layers/layer.h" 8 #include "cc/layers/layer.h"
9 #include "cc/layers/layer_settings.h"
10 #include "cc/layers/solid_color_layer.h" 9 #include "cc/layers/solid_color_layer.h"
11 #include "cc/resources/scoped_ui_resource.h" 10 #include "cc/resources/scoped_ui_resource.h"
12 #include "chrome/browser/android/compositor/decoration_title.h" 11 #include "chrome/browser/android/compositor/decoration_title.h"
13 #include "chrome/browser/android/compositor/layer_title_cache.h" 12 #include "chrome/browser/android/compositor/layer_title_cache.h"
14 #include "content/public/browser/android/compositor.h" 13 #include "content/public/browser/android/compositor.h"
15 #include "ui/android/resources/resource_manager.h" 14 #include "ui/android/resources/resource_manager.h"
16 #include "ui/base/l10n/l10n_util_android.h" 15 #include "ui/base/l10n/l10n_util_android.h"
17 16
18 namespace chrome { 17 namespace chrome {
19 namespace android { 18 namespace android {
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 close_button_->SetOpacity(close_button_alpha); 171 close_button_->SetOpacity(close_button_alpha);
173 } 172 }
174 } 173 }
175 174
176 scoped_refptr<cc::Layer> TabHandleLayer::layer() { 175 scoped_refptr<cc::Layer> TabHandleLayer::layer() {
177 return layer_; 176 return layer_;
178 } 177 }
179 178
180 TabHandleLayer::TabHandleLayer(LayerTitleCache* layer_title_cache) 179 TabHandleLayer::TabHandleLayer(LayerTitleCache* layer_title_cache)
181 : layer_title_cache_(layer_title_cache), 180 : layer_title_cache_(layer_title_cache),
182 layer_(cc::Layer::Create(cc::LayerSettings())), 181 layer_(cc::Layer::Create()),
183 close_button_( 182 close_button_(cc::UIResourceLayer::Create()),
184 cc::UIResourceLayer::Create(cc::LayerSettings())), 183 decoration_tab_(cc::NinePatchLayer::Create()),
185 decoration_tab_( 184 border_(cc::SolidColorLayer::Create()),
186 cc::NinePatchLayer::Create(cc::LayerSettings())),
187 border_(
188 cc::SolidColorLayer::Create(cc::LayerSettings())),
189 brightness_(1.0f), 185 brightness_(1.0f),
190 foreground_(false) { 186 foreground_(false) {
191 decoration_tab_->SetIsDrawable(true); 187 decoration_tab_->SetIsDrawable(true);
192 layer_->AddChild(decoration_tab_); 188 layer_->AddChild(decoration_tab_);
193 layer_->AddChild(close_button_); 189 layer_->AddChild(close_button_);
194 } 190 }
195 191
196 TabHandleLayer::~TabHandleLayer() { 192 TabHandleLayer::~TabHandleLayer() {
197 } 193 }
198 194
199 } // namespace android 195 } // namespace android
200 } // namespace chrome 196 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/android/compositor/layer/overlay_panel_layer.cc ('k') | chrome/browser/android/compositor/layer/tab_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698