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

Side by Side Diff: chrome/browser/android/compositor/decoration_title.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 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/decoration_title.h" 5 #include "chrome/browser/android/compositor/decoration_title.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "cc/layers/layer.h" 11 #include "cc/layers/layer.h"
12 #include "cc/layers/layer_settings.h"
13 #include "cc/layers/ui_resource_layer.h" 12 #include "cc/layers/ui_resource_layer.h"
14 #include "cc/resources/scoped_ui_resource.h" 13 #include "cc/resources/scoped_ui_resource.h"
15 #include "chrome/browser/android/compositor/layer_title_cache.h" 14 #include "chrome/browser/android/compositor/layer_title_cache.h"
16 #include "content/public/browser/android/compositor.h" 15 #include "content/public/browser/android/compositor.h"
17 #include "ui/android/resources/resource_manager.h" 16 #include "ui/android/resources/resource_manager.h"
18 #include "ui/base/l10n/l10n_util_android.h" 17 #include "ui/base/l10n/l10n_util_android.h"
19 #include "ui/gfx/android/java_bitmap.h" 18 #include "ui/gfx/android/java_bitmap.h"
20 #include "ui/gfx/geometry/vector3d_f.h" 19 #include "ui/gfx/geometry/vector3d_f.h"
21 20
22 namespace chrome { 21 namespace chrome {
23 namespace android { 22 namespace android {
24 23
25 DecorationTitle::DecorationTitle(LayerTitleCache* layer_title_cache, 24 DecorationTitle::DecorationTitle(LayerTitleCache* layer_title_cache,
26 ui::ResourceManager* resource_manager, 25 ui::ResourceManager* resource_manager,
27 int title_resource_id, 26 int title_resource_id,
28 int favicon_resource_id, 27 int favicon_resource_id,
29 int spinner_resource_id, 28 int spinner_resource_id,
30 int spinner_incognito_resource_id, 29 int spinner_incognito_resource_id,
31 int fade_width, 30 int fade_width,
32 int favicon_start_padding, 31 int favicon_start_padding,
33 int favicon_end_padding, 32 int favicon_end_padding,
34 bool is_incognito, 33 bool is_incognito,
35 bool is_rtl) 34 bool is_rtl)
36 : layer_(cc::Layer::Create(cc::LayerSettings())), 35 : layer_(cc::Layer::Create()),
37 layer_opaque_( 36 layer_opaque_(cc::UIResourceLayer::Create()),
38 cc::UIResourceLayer::Create(cc::LayerSettings())), 37 layer_fade_(cc::UIResourceLayer::Create()),
39 layer_fade_( 38 layer_favicon_(cc::UIResourceLayer::Create()),
40 cc::UIResourceLayer::Create(cc::LayerSettings())),
41 layer_favicon_(
42 cc::UIResourceLayer::Create(cc::LayerSettings())),
43 title_resource_id_(title_resource_id), 39 title_resource_id_(title_resource_id),
44 favicon_resource_id_(favicon_resource_id), 40 favicon_resource_id_(favicon_resource_id),
45 spinner_resource_id_(spinner_resource_id), 41 spinner_resource_id_(spinner_resource_id),
46 spinner_incognito_resource_id_(spinner_incognito_resource_id), 42 spinner_incognito_resource_id_(spinner_incognito_resource_id),
47 fade_width_(fade_width), 43 fade_width_(fade_width),
48 spinner_rotation_(0), 44 spinner_rotation_(0),
49 favicon_start_padding_(favicon_start_padding), 45 favicon_start_padding_(favicon_start_padding),
50 favicon_end_padding_(favicon_end_padding), 46 favicon_end_padding_(favicon_end_padding),
51 is_incognito_(is_incognito), 47 is_incognito_(is_incognito),
52 is_rtl_(is_rtl), 48 is_rtl_(is_rtl),
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 } 239 }
244 } 240 }
245 241
246 scoped_refptr<cc::Layer> DecorationTitle::layer() { 242 scoped_refptr<cc::Layer> DecorationTitle::layer() {
247 DCHECK(layer_.get()); 243 DCHECK(layer_.get());
248 return layer_; 244 return layer_;
249 } 245 }
250 246
251 } // namespace android 247 } // namespace android
252 } // namespace chrome 248 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698