chrome/browser/android/compositor/decoration_title.cc - Issue 1747783002: CC Animation: Erase old animation system in Android Compositor.

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 1747783002: CC Animation: Erase old animation system in Android Compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compilation. Created 4 years, 10 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

« chrome/browser/android/DEPS ('K') | « chrome/browser/android/compositor/compositor_view.cc ('k') | chrome/browser/android/compositor/layer/content_layer.cc » ('j') | no next file with comments »
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 146f5bfecf63b72577bf60fc9aa40ef161641d0c..a9b0483404f4478fadc3ed0b2b20ad6212629843 100644

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

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

@@ -9,6 +9,7 @@

#include "base/i18n/rtl.h"

#include "base/logging.h"

#include "cc/layers/layer.h"

+#include "cc/layers/layer_settings.h"

#include "cc/layers/ui_resource_layer.h"

#include "cc/resources/scoped_ui_resource.h"

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

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

int favicon_end_padding,

bool is_incognito,

bool is_rtl)

- : layer_(cc::Layer::Create(content::Compositor::LayerSettings())),

+ : layer_(cc::Layer::Create(cc::LayerSettings())),

layer_opaque_(

- cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),

+ cc::UIResourceLayer::Create(cc::LayerSettings())),

layer_fade_(

- cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),

+ cc::UIResourceLayer::Create(cc::LayerSettings())),

layer_favicon_(

- cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),

+ cc::UIResourceLayer::Create(cc::LayerSettings())),

title_resource_id_(title_resource_id),

favicon_resource_id_(favicon_resource_id),

spinner_resource_id_(spinner_resource_id),