chrome/browser/android/compositor/layer/toolbar_layer.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/layer/toolbar_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/compositor/layer/thumbnail_layer.cc ('k') | chrome/browser/android/compositor/scene_layer/scene_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/compositor/layer/toolbar_layer.cc

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

index ea8853877152965daac0220516995903e059b8cb..692d6b01753f8b0793ac8b0ca56089fc749ecab6 100644

--- a/chrome/browser/android/compositor/layer/toolbar_layer.cc

+++ b/chrome/browser/android/compositor/layer/toolbar_layer.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/android/compositor/layer/toolbar_layer.h"

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

#include "cc/layers/nine_patch_layer.h"

#include "cc/layers/solid_color_layer.h"

#include "cc/layers/ui_resource_layer.h"

@@ -149,21 +150,21 @@ void ToolbarLayer::UpdateProgressBar(int progress_bar_x,

ToolbarLayer::ToolbarLayer(ui::ResourceManager* resource_manager)

: resource_manager_(resource_manager),

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

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

toolbar_background_layer_(

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

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

url_bar_background_layer_(

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

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

bitmap_layer_(

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

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

progress_bar_layer_(

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

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

progress_bar_background_layer_(

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

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

anonymize_layer_(

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

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

debug_layer_(

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

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

brightness_(1.f) {

toolbar_background_layer_->SetIsDrawable(true);

layer_->AddChild(toolbar_background_layer_);