Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

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

Powered by Google App Engine
This is Rietveld 408576698