chrome/browser/android/compositor/layer/content_layer.cc - Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere.

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/content_layer.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid

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/decoration_title.cc ('k') | chrome/browser/android/compositor/layer/contextual_search_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e83a2c450f0174d911546f83b4116becbac23c61..579288378260583528dbba6e9be54ff8fe927eb7 100644

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

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

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

#include "base/lazy_instance.h"

#include "cc/layers/layer.h"

#include "cc/layers/layer_lists.h"

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

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

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

#include "content/public/browser/android/compositor.h"

@@ -146,11 +145,10 @@ scoped_refptr<cc::Layer> ContentLayer::layer() {

}

ContentLayer::ContentLayer(TabContentManager* tab_content_manager)

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

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

content_attached_(false),

static_attached_(false),

- tab_content_manager_(tab_content_manager) {

+ tab_content_manager_(tab_content_manager) {}

ContentLayer::~ContentLayer() {

}