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

Side by Side Diff: ui/android/edge_effect.cc

Issue 1747783002: CC Animation: Erase old animation system in Android Compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
« no previous file with comments | « ui/android/BUILD.gn ('k') | ui/android/edge_effect_l.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/android/edge_effect.h" 5 #include "ui/android/edge_effect.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "cc/layers/layer.h" 8 #include "cc/layers/layer.h"
9 #include "cc/layers/layer_settings.h"
9 #include "cc/layers/ui_resource_layer.h" 10 #include "cc/layers/ui_resource_layer.h"
10 #include "ui/android/animation_utils.h" 11 #include "ui/android/animation_utils.h"
11 #include "ui/android/resources/resource_manager.h" 12 #include "ui/android/resources/resource_manager.h"
12 #include "ui/android/resources/system_ui_resource_type.h" 13 #include "ui/android/resources/system_ui_resource_type.h"
13 #include "ui/android/window_android_compositor.h" 14 #include "ui/android/window_android_compositor.h"
14 15
15 namespace ui { 16 namespace ui {
16 17
17 namespace { 18 namespace {
18 19
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 59
59 const float kEdgeHeightAtMdpi = 12.f; 60 const float kEdgeHeightAtMdpi = 12.f;
60 const float kGlowHeightAtMdpi = 128.f; 61 const float kGlowHeightAtMdpi = 128.f;
61 62
62 } // namespace 63 } // namespace
63 64
64 class EdgeEffect::EffectLayer { 65 class EdgeEffect::EffectLayer {
65 public: 66 public:
66 EffectLayer(ui::SystemUIResourceType resource_type, 67 EffectLayer(ui::SystemUIResourceType resource_type,
67 ui::ResourceManager* resource_manager) 68 ui::ResourceManager* resource_manager)
68 : ui_resource_layer_(cc::UIResourceLayer::Create( 69 : ui_resource_layer_(cc::UIResourceLayer::Create(cc::LayerSettings())),
69 WindowAndroidCompositor::LayerSettings())),
70 resource_type_(resource_type), 70 resource_type_(resource_type),
71 resource_manager_(resource_manager) {} 71 resource_manager_(resource_manager) {}
72 72
73 ~EffectLayer() { ui_resource_layer_->RemoveFromParent(); } 73 ~EffectLayer() { ui_resource_layer_->RemoveFromParent(); }
74 74
75 void SetParent(cc::Layer* parent) { 75 void SetParent(cc::Layer* parent) {
76 if (ui_resource_layer_->parent() != parent) 76 if (ui_resource_layer_->parent() != parent)
77 parent->AddChild(ui_resource_layer_); 77 parent->AddChild(ui_resource_layer_);
78 } 78 }
79 79
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 // static 352 // static
353 void EdgeEffect::PreloadResources(ui::ResourceManager* resource_manager) { 353 void EdgeEffect::PreloadResources(ui::ResourceManager* resource_manager) {
354 DCHECK(resource_manager); 354 DCHECK(resource_manager);
355 resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM, 355 resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
356 kEdgeResourceId); 356 kEdgeResourceId);
357 resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM, 357 resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
358 kGlowResourceId); 358 kGlowResourceId);
359 } 359 }
360 360
361 } // namespace ui 361 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/BUILD.gn ('k') | ui/android/edge_effect_l.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698