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

Side by Side Diff: chrome/browser/android/compositor/layer/tab_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 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/layer/tab_layer.h" 5 #include "chrome/browser/android/compositor/layer/tab_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_lists.h" 9 #include "cc/layers/layer_lists.h"
10 #include "cc/layers/layer_settings.h"
10 #include "cc/layers/nine_patch_layer.h" 11 #include "cc/layers/nine_patch_layer.h"
11 #include "cc/layers/solid_color_layer.h" 12 #include "cc/layers/solid_color_layer.h"
12 #include "cc/layers/ui_resource_layer.h" 13 #include "cc/layers/ui_resource_layer.h"
13 #include "cc/resources/scoped_ui_resource.h" 14 #include "cc/resources/scoped_ui_resource.h"
14 #include "chrome/browser/android/compositor/decoration_title.h" 15 #include "chrome/browser/android/compositor/decoration_title.h"
15 #include "chrome/browser/android/compositor/layer/content_layer.h" 16 #include "chrome/browser/android/compositor/layer/content_layer.h"
16 #include "chrome/browser/android/compositor/layer/toolbar_layer.h" 17 #include "chrome/browser/android/compositor/layer/toolbar_layer.h"
17 #include "chrome/browser/android/compositor/layer_title_cache.h" 18 #include "chrome/browser/android/compositor/layer_title_cache.h"
18 #include "chrome/browser/android/compositor/tab_content_manager.h" 19 #include "chrome/browser/android/compositor/tab_content_manager.h"
19 #include "content/public/browser/android/compositor.h" 20 #include "content/public/browser/android/compositor.h"
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 return layer_; 579 return layer_;
579 } 580 }
580 581
581 TabLayer::TabLayer(bool incognito, 582 TabLayer::TabLayer(bool incognito,
582 ui::ResourceManager* resource_manager, 583 ui::ResourceManager* resource_manager,
583 LayerTitleCache* layer_title_cache, 584 LayerTitleCache* layer_title_cache,
584 TabContentManager* tab_content_manager) 585 TabContentManager* tab_content_manager)
585 : incognito_(incognito), 586 : incognito_(incognito),
586 resource_manager_(resource_manager), 587 resource_manager_(resource_manager),
587 layer_title_cache_(layer_title_cache), 588 layer_title_cache_(layer_title_cache),
588 layer_(cc::Layer::Create(content::Compositor::LayerSettings())), 589 layer_(cc::Layer::Create(cc::LayerSettings())),
589 toolbar_layer_(ToolbarLayer::Create(resource_manager)), 590 toolbar_layer_(ToolbarLayer::Create(resource_manager)),
590 title_(cc::Layer::Create(content::Compositor::LayerSettings())), 591 title_(cc::Layer::Create(cc::LayerSettings())),
591 content_(ContentLayer::Create(tab_content_manager)), 592 content_(ContentLayer::Create(tab_content_manager)),
592 padding_( 593 padding_(
593 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())), 594 cc::SolidColorLayer::Create(cc::LayerSettings())),
594 close_button_( 595 close_button_(
595 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), 596 cc::UIResourceLayer::Create(cc::LayerSettings())),
596 front_border_( 597 front_border_(
597 cc::NinePatchLayer::Create(content::Compositor::LayerSettings())), 598 cc::NinePatchLayer::Create(cc::LayerSettings())),
598 front_border_inner_shadow_( 599 front_border_inner_shadow_(
599 cc::NinePatchLayer::Create(content::Compositor::LayerSettings())), 600 cc::NinePatchLayer::Create(cc::LayerSettings())),
600 contour_shadow_( 601 contour_shadow_(
601 cc::NinePatchLayer::Create(content::Compositor::LayerSettings())), 602 cc::NinePatchLayer::Create(cc::LayerSettings())),
602 shadow_(cc::NinePatchLayer::Create(content::Compositor::LayerSettings())), 603 shadow_(cc::NinePatchLayer::Create(cc::LayerSettings())),
603 back_logo_( 604 back_logo_(
604 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), 605 cc::UIResourceLayer::Create(cc::LayerSettings())),
605 brightness_(1.f) { 606 brightness_(1.f) {
606 layer_->AddChild(shadow_); 607 layer_->AddChild(shadow_);
607 layer_->AddChild(contour_shadow_); 608 layer_->AddChild(contour_shadow_);
608 layer_->AddChild(padding_); 609 layer_->AddChild(padding_);
609 layer_->AddChild(content_->layer()); 610 layer_->AddChild(content_->layer());
610 layer_->AddChild(back_logo_); 611 layer_->AddChild(back_logo_);
611 layer_->AddChild(front_border_inner_shadow_); 612 layer_->AddChild(front_border_inner_shadow_);
612 layer_->AddChild(front_border_); 613 layer_->AddChild(front_border_);
613 layer_->AddChild(title_.get()); 614 layer_->AddChild(title_.get());
614 layer_->AddChild(close_button_); 615 layer_->AddChild(close_button_);
(...skipping 25 matching lines...) Expand all
640 title_->AddChild(layer); 641 title_->AddChild(layer);
641 } 642 }
642 } 643 }
643 644
644 if (title) 645 if (title)
645 title->SetUIResourceIds(); 646 title->SetUIResourceIds();
646 } 647 }
647 648
648 } // namespace android 649 } // namespace android
649 } // namespace chrome 650 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698