chrome/browser/android/compositor/decoration_title.cc - Issue 1101823002: CC Animations: Make LayerAnimationController creation optional

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/compositor/decoration_title.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Plumb LayerSettings parameter for cc::Layer construction. 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 side-by-side diff with in-line comments

Download patch

« cc/blink/web_layer_impl.cc ('K') | « cc/trees/tree_synchronizer_unittest.cc ('k') | chrome/browser/android/compositor/layer/content_layer.h » ('j') | chrome/browser/android/compositor/layer/content_layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/compositor/decoration_title.cc

diff --git a/chrome/browser/android/compositor/decoration_title.cc b/chrome/browser/android/compositor/decoration_title.cc

index ded630714198e7f6beb0ecc494d2dbd400096a86..c3c3b1cc0d9228165aca4fa16ecffacda0d74828 100644

--- a/chrome/browser/android/compositor/decoration_title.cc

+++ b/chrome/browser/android/compositor/decoration_title.cc

@@ -10,6 +10,7 @@

#include "base/logging.h"

#include "cc/layers/layer.h"

#include "cc/layers/ui_resource_layer.h"

+#include "chrome/browser/android/compositor/layer/content_layer.h"

#include "chrome/browser/android/compositor/layer_title_cache.h"

#include "ui/android/resources/resource_manager.h"

#include "ui/android/resources/ui_resource_android.h"

@@ -31,10 +32,13 @@ DecorationTitle::DecorationTitle(LayerTitleCache* layer_title_cache,

int favicon_end_padding,

bool is_incognito,

bool is_rtl)

- : layer_(cc::Layer::Create()),

- layer_opaque_(cc::UIResourceLayer::Create()),

- layer_fade_(cc::UIResourceLayer::Create()),

- layer_favicon_(cc::UIResourceLayer::Create()),

+ : layer_(cc::Layer::Create(ContentLayer::ContentLayerSettings())),

+ layer_opaque_(

+ cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),

+ layer_fade_(

+ cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),

+ layer_favicon_(

+ cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),

title_resource_id_(title_resource_id),

favicon_resource_id_(favicon_resource_id),

spinner_resource_id_(spinner_resource_id),