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

Side by Side Diff: content/browser/android/edge_effect.cc

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 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 (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 "content/browser/android/edge_effect.h" 5 #include "content/browser/android/edge_effect.h"
6 6
7 #include "cc/layers/layer.h" 7 #include "cc/layers/layer.h"
8 #include "cc/layers/ui_resource_layer.h" 8 #include "cc/layers/ui_resource_layer.h"
9 #include "content/browser/android/animation_utils.h" 9 #include "content/browser/android/animation_utils.h"
10 #include "content/public/browser/android/compositor.h"
10 #include "ui/android/resources/resource_manager.h" 11 #include "ui/android/resources/resource_manager.h"
11 #include "ui/android/resources/system_ui_resource_type.h" 12 #include "ui/android/resources/system_ui_resource_type.h"
12 13
13 namespace content { 14 namespace content {
14 15
15 namespace { 16 namespace {
16 17
17 const ui::SystemUIResourceType kEdgeResourceId = ui::OVERSCROLL_EDGE; 18 const ui::SystemUIResourceType kEdgeResourceId = ui::OVERSCROLL_EDGE;
18 const ui::SystemUIResourceType kGlowResourceId = ui::OVERSCROLL_GLOW; 19 const ui::SystemUIResourceType kGlowResourceId = ui::OVERSCROLL_GLOW;
19 20
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 57
57 const float kEdgeHeightAtMdpi = 12.f; 58 const float kEdgeHeightAtMdpi = 12.f;
58 const float kGlowHeightAtMdpi = 128.f; 59 const float kGlowHeightAtMdpi = 128.f;
59 60
60 } // namespace 61 } // namespace
61 62
62 class EdgeEffect::EffectLayer { 63 class EdgeEffect::EffectLayer {
63 public: 64 public:
64 EffectLayer(ui::SystemUIResourceType resource_type, 65 EffectLayer(ui::SystemUIResourceType resource_type,
65 ui::ResourceManager* resource_manager) 66 ui::ResourceManager* resource_manager)
66 : ui_resource_layer_(cc::UIResourceLayer::Create()), 67 : ui_resource_layer_(
68 cc::UIResourceLayer::Create(Compositor::LayerSettings())),
67 resource_type_(resource_type), 69 resource_type_(resource_type),
68 resource_manager_(resource_manager) {} 70 resource_manager_(resource_manager) {}
69 71
70 ~EffectLayer() { ui_resource_layer_->RemoveFromParent(); } 72 ~EffectLayer() { ui_resource_layer_->RemoveFromParent(); }
71 73
72 void SetParent(cc::Layer* parent) { 74 void SetParent(cc::Layer* parent) {
73 if (ui_resource_layer_->parent() != parent) 75 if (ui_resource_layer_->parent() != parent)
74 parent->AddChild(ui_resource_layer_); 76 parent->AddChild(ui_resource_layer_);
75 } 77 }
76 78
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 // static 347 // static
346 void EdgeEffect::PreloadResources(ui::ResourceManager* resource_manager) { 348 void EdgeEffect::PreloadResources(ui::ResourceManager* resource_manager) {
347 DCHECK(resource_manager); 349 DCHECK(resource_manager);
348 resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM, 350 resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
349 kEdgeResourceId); 351 kEdgeResourceId);
350 resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM, 352 resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
351 kGlowResourceId); 353 kGlowResourceId);
352 } 354 }
353 355
354 } // namespace content 356 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_view_core_impl.cc ('k') | content/browser/android/edge_effect_l.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698