chrome/browser/android/compositor/scene_layer/scene_layer.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/scene_layer/scene_layer.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

« chrome/browser/android/compositor/layer/content_layer.cc ('K') | « chrome/browser/android/compositor/layer/toolbar_layer.cc ('k') | components/html_viewer/web_layer_tree_view_impl.cc » ('j') | content/renderer/gpu/render_widget_compositor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ee8eeba52bf23269f19163c8b6535cd79c19f6ee..4ad0404d5fde44f86e45dd23c6c14c25fe94cc41 100644

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

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

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

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

#include "cc/layers/layer.h"

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

#include "jni/SceneLayer_jni.h"

namespace chrome {

@@ -18,7 +19,9 @@ SceneLayer* SceneLayer::FromJavaObject(JNIEnv* env, jobject jobj) {

}

SceneLayer::SceneLayer(JNIEnv* env, jobject jobj)

- : SceneLayer(env, jobj, cc::Layer::Create()) {

+ : SceneLayer(env,

+ jobj,

+ cc::Layer::Create(ContentLayer::ContentLayerSettings())) {

}

SceneLayer::SceneLayer(JNIEnv* env,