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: chrome/browser/android/compositor/layer/tab_layer.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, 7 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/image_layer.h" 8 #include "cc/layers/image_layer.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/layers/layer_lists.h" 10 #include "cc/layers/layer_lists.h"
11 #include "cc/layers/nine_patch_layer.h" 11 #include "cc/layers/nine_patch_layer.h"
12 #include "cc/layers/solid_color_layer.h" 12 #include "cc/layers/solid_color_layer.h"
13 #include "cc/layers/ui_resource_layer.h" 13 #include "cc/layers/ui_resource_layer.h"
14 #include "chrome/browser/android/compositor/decoration_title.h" 14 #include "chrome/browser/android/compositor/decoration_title.h"
15 #include "chrome/browser/android/compositor/layer/content_layer.h" 15 #include "chrome/browser/android/compositor/layer/content_layer.h"
16 #include "chrome/browser/android/compositor/layer/toolbar_layer.h" 16 #include "chrome/browser/android/compositor/layer/toolbar_layer.h"
17 #include "chrome/browser/android/compositor/layer_title_cache.h" 17 #include "chrome/browser/android/compositor/layer_title_cache.h"
18 #include "chrome/browser/android/compositor/tab_content_manager.h" 18 #include "chrome/browser/android/compositor/tab_content_manager.h"
19 #include "content/public/browser/android/compositor.h"
19 #include "ui/android/resources/resource_manager.h" 20 #include "ui/android/resources/resource_manager.h"
20 #include "ui/android/resources/ui_resource_android.h" 21 #include "ui/android/resources/ui_resource_android.h"
21 #include "ui/base/l10n/l10n_util_android.h" 22 #include "ui/base/l10n/l10n_util_android.h"
22 #include "ui/gfx/geometry/insets_f.h" 23 #include "ui/gfx/geometry/insets_f.h"
23 #include "ui/gfx/geometry/point_f.h" 24 #include "ui/gfx/geometry/point_f.h"
24 #include "ui/gfx/geometry/rect_f.h" 25 #include "ui/gfx/geometry/rect_f.h"
25 #include "ui/gfx/geometry/safe_integer_conversions.h" 26 #include "ui/gfx/geometry/safe_integer_conversions.h"
26 #include "ui/gfx/geometry/size.h" 27 #include "ui/gfx/geometry/size.h"
27 #include "ui/gfx/transform.h" 28 #include "ui/gfx/transform.h"
28 29
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 return layer_; 524 return layer_;
524 } 525 }
525 526
526 TabLayer::TabLayer(bool incognito, 527 TabLayer::TabLayer(bool incognito,
527 ui::ResourceManager* resource_manager, 528 ui::ResourceManager* resource_manager,
528 LayerTitleCache* layer_title_cache, 529 LayerTitleCache* layer_title_cache,
529 TabContentManager* tab_content_manager) 530 TabContentManager* tab_content_manager)
530 : incognito_(incognito), 531 : incognito_(incognito),
531 resource_manager_(resource_manager), 532 resource_manager_(resource_manager),
532 layer_title_cache_(layer_title_cache), 533 layer_title_cache_(layer_title_cache),
533 layer_(cc::Layer::Create()), 534 layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
534 toolbar_layer_(ToolbarLayer::Create()), 535 toolbar_layer_(ToolbarLayer::Create()),
535 title_(cc::Layer::Create()), 536 title_(cc::Layer::Create(content::Compositor::LayerSettings())),
536 content_(ContentLayer::Create(tab_content_manager)), 537 content_(ContentLayer::Create(tab_content_manager)),
537 padding_(cc::SolidColorLayer::Create()), 538 padding_(
538 close_button_(cc::UIResourceLayer::Create()), 539 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
539 front_border_(cc::NinePatchLayer::Create()), 540 close_button_(
540 contour_shadow_(cc::NinePatchLayer::Create()), 541 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
541 shadow_(cc::NinePatchLayer::Create()), 542 front_border_(
542 back_logo_(cc::UIResourceLayer::Create()), 543 cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
544 contour_shadow_(
545 cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
546 shadow_(cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
547 back_logo_(
548 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
543 brightness_(1.f) { 549 brightness_(1.f) {
544 layer_->AddChild(shadow_); 550 layer_->AddChild(shadow_);
545 layer_->AddChild(contour_shadow_); 551 layer_->AddChild(contour_shadow_);
546 layer_->AddChild(padding_); 552 layer_->AddChild(padding_);
547 layer_->AddChild(content_->layer()); 553 layer_->AddChild(content_->layer());
548 layer_->AddChild(back_logo_); 554 layer_->AddChild(back_logo_);
549 layer_->AddChild(front_border_); 555 layer_->AddChild(front_border_);
550 layer_->AddChild(title_.get()); 556 layer_->AddChild(title_.get());
551 layer_->AddChild(close_button_); 557 layer_->AddChild(close_button_);
552 layer_->AddChild(toolbar_layer_->layer()); 558 layer_->AddChild(toolbar_layer_->layer());
(...skipping 21 matching lines...) Expand all
574 title_->AddChild(layer); 580 title_->AddChild(layer);
575 } 581 }
576 } 582 }
577 583
578 if (title) 584 if (title)
579 title->SetUIResourceIds(); 585 title->SetUIResourceIds();
580 } 586 }
581 587
582 } // namespace android 588 } // namespace android
583 } // namespace chrome 589 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698