content/renderer/child_frame_compositing_helper.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/renderer/child_frame_compositing_helper.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 | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/child_frame_compositing_helper.cc

diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc

index e5ee906baaacd0fa22804614131f05c118942d67..cad94adbde011de06470dacc41008c6ecc7891d7 100644

--- a/content/renderer/child_frame_compositing_helper.cc

+++ b/content/renderer/child_frame_compositing_helper.cc

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

#include <utility>

#include "cc/blink/web_layer_impl.h"

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

#include "cc/layers/picture_image_layer.h"

#include "cc/layers/solid_color_layer.h"

#include "cc/layers/surface_layer.h"

@@ -119,7 +118,7 @@ void ChildFrameCompositingHelper::OnContainerDestroy() {

void ChildFrameCompositingHelper::ChildFrameGone() {

scoped_refptr<cc::SolidColorLayer> crashed_layer =

- cc::SolidColorLayer::Create(cc::LayerSettings());

+ cc::SolidColorLayer::Create();

crashed_layer->SetMasksToBounds(true);

crashed_layer->SetBackgroundColor(SK_ColorBLACK);

@@ -129,7 +128,7 @@ void ChildFrameCompositingHelper::ChildFrameGone() {

if (sad_bitmap && web_layer_->bounds().width > sad_bitmap->width() &&

web_layer_->bounds().height > sad_bitmap->height()) {

scoped_refptr<cc::PictureImageLayer> sad_layer =

- cc::PictureImageLayer::Create(cc::LayerSettings());

+ cc::PictureImageLayer::Create();

skia::RefPtr<SkImage> image =

skia::AdoptRef(SkImage::NewFromBitmap(*sad_bitmap));

sad_layer->SetImage(image);

@@ -213,8 +212,7 @@ void ChildFrameCompositingHelper::OnSetSurface(

sender, host_routing_id_,

browser_plugin_->browser_plugin_instance_id());

scoped_refptr<cc::SurfaceLayer> surface_layer =

- cc::SurfaceLayer::Create(cc::LayerSettings(),

- satisfy_callback, require_callback);

+ cc::SurfaceLayer::Create(satisfy_callback, require_callback);

// TODO(oshima): This is a stopgap fix so that the compositor does not

// scaledown the content when 2x frame data is added to 1x parent frame data.

// Fix this in cc/.