content/browser/renderer_host/render_widget_host_view_android.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: content/browser/renderer_host/render_widget_host_view_android.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

« cc/test/layer_tree_host_common_test.cc ('K') | « content/browser/renderer_host/compositor_impl_android.cc ('k') | content/renderer/child_frame_compositing_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_android.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc

index c6d9f800d755e2eb29803decc15be381eee82d8a..543ec66cf03ce8cb12b230b3d5be7a179d6c4168 100644

--- a/content/browser/renderer_host/render_widget_host_view_android.cc

+++ b/content/browser/renderer_host/render_widget_host_view_android.cc

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

#include "base/sys_info.h"

#include "base/threading/worker_pool.h"

#include "cc/layers/layer.h"

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

#include "cc/layers/surface_layer.h"

#include "cc/output/compositor_frame.h"

#include "cc/output/compositor_frame_ack.h"

@@ -446,7 +445,7 @@ scoped_refptr<cc::Layer> RenderWidgetHostViewAndroid::CreateDelegatedLayer()

DCHECK(manager);

// manager must outlive compositors using it.

scoped_refptr<cc::SurfaceLayer> surface_layer = cc::SurfaceLayer::Create(

- cc::LayerSettings(),

ajuma 2016/03/11 00:40:54 No need for a blank line here.

loyso (OOO) 2016/03/11 03:26:57 Done.

base::Bind(&SatisfyCallback, base::Unretained(manager)),

base::Bind(&RequireCallback, base::Unretained(manager)));

surface_layer->SetSurfaceId(surface_id_, 1.f, texture_size_in_layer_);