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

Side by Side Diff: chrome/browser/android/compositor/layer/overlay_panel_layer.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
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/overlay_panel_layer.h" 5 #include "chrome/browser/android/compositor/layer/overlay_panel_layer.h"
6 6
7 #include "cc/layers/layer.h" 7 #include "cc/layers/layer.h"
8 #include "cc/layers/layer_settings.h"
8 #include "cc/layers/nine_patch_layer.h" 9 #include "cc/layers/nine_patch_layer.h"
9 #include "cc/layers/solid_color_layer.h" 10 #include "cc/layers/solid_color_layer.h"
10 #include "cc/layers/ui_resource_layer.h" 11 #include "cc/layers/ui_resource_layer.h"
11 #include "cc/resources/scoped_ui_resource.h" 12 #include "cc/resources/scoped_ui_resource.h"
12 #include "content/public/browser/android/compositor.h" 13 #include "content/public/browser/android/compositor.h"
13 #include "content/public/browser/android/content_view_core.h" 14 #include "content/public/browser/android/content_view_core.h"
14 #include "third_party/skia/include/core/SkColor.h" 15 #include "third_party/skia/include/core/SkColor.h"
15 #include "ui/android/resources/crushed_sprite_resource.h" 16 #include "ui/android/resources/crushed_sprite_resource.h"
16 #include "ui/android/resources/resource_manager.h" 17 #include "ui/android/resources/resource_manager.h"
17 #include "ui/base/l10n/l10n_util_android.h" 18 #include "ui/base/l10n/l10n_util_android.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 gfx::PointF(0.f, border_y)); 254 gfx::PointF(0.f, border_y));
254 layer_->AddChild(bar_border_); 255 layer_->AddChild(bar_border_);
255 } else if (bar_border_.get() && bar_border_->parent()) { 256 } else if (bar_border_.get() && bar_border_->parent()) {
256 bar_border_->RemoveFromParent(); 257 bar_border_->RemoveFromParent();
257 } 258 }
258 } 259 }
259 260
260 OverlayPanelLayer::OverlayPanelLayer( 261 OverlayPanelLayer::OverlayPanelLayer(
261 ui::ResourceManager* resource_manager) 262 ui::ResourceManager* resource_manager)
262 : resource_manager_(resource_manager), 263 : resource_manager_(resource_manager),
263 layer_(cc::Layer::Create(content::Compositor::LayerSettings())), 264 layer_(cc::Layer::Create(cc::LayerSettings())),
264 panel_shadow_( 265 panel_shadow_(
265 cc::NinePatchLayer::Create(content::Compositor::LayerSettings())), 266 cc::NinePatchLayer::Create(cc::LayerSettings())),
266 bar_background_( 267 bar_background_(
267 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())), 268 cc::SolidColorLayer::Create(cc::LayerSettings())),
268 bar_text_( 269 bar_text_(
269 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), 270 cc::UIResourceLayer::Create(cc::LayerSettings())),
270 bar_shadow_( 271 bar_shadow_(
271 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), 272 cc::UIResourceLayer::Create(cc::LayerSettings())),
272 panel_icon_( 273 panel_icon_(
273 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), 274 cc::UIResourceLayer::Create(cc::LayerSettings())),
274 close_icon_( 275 close_icon_(
275 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), 276 cc::UIResourceLayer::Create(cc::LayerSettings())),
276 content_view_container_( 277 content_view_container_(
277 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())), 278 cc::SolidColorLayer::Create(cc::LayerSettings())),
278 text_container_(cc::Layer::Create(content::Compositor::LayerSettings())), 279 text_container_(cc::Layer::Create(cc::LayerSettings())),
279 bar_border_( 280 bar_border_(
280 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())) { 281 cc::SolidColorLayer::Create(cc::LayerSettings())) {
281 layer_->SetMasksToBounds(false); 282 layer_->SetMasksToBounds(false);
282 layer_->SetIsDrawable(true); 283 layer_->SetIsDrawable(true);
283 284
284 // Panel Shadow 285 // Panel Shadow
285 panel_shadow_->SetIsDrawable(true); 286 panel_shadow_->SetIsDrawable(true);
286 panel_shadow_->SetFillCenter(false); 287 panel_shadow_->SetFillCenter(false);
287 layer_->AddChild(panel_shadow_); 288 layer_->AddChild(panel_shadow_);
288 289
289 // Bar Background 290 // Bar Background
290 bar_background_->SetIsDrawable(true); 291 bar_background_->SetIsDrawable(true);
(...skipping 30 matching lines...) Expand all
321 322
322 OverlayPanelLayer::~OverlayPanelLayer() { 323 OverlayPanelLayer::~OverlayPanelLayer() {
323 } 324 }
324 325
325 scoped_refptr<cc::Layer> OverlayPanelLayer::layer() { 326 scoped_refptr<cc::Layer> OverlayPanelLayer::layer() {
326 return layer_; 327 return layer_;
327 } 328 }
328 329
329 } // namespace android 330 } // namespace android
330 } // namespace chrome 331 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698