CC Animation: Erase cc::LayerSettings everywhere.

content/renderer/child_frame_compositing_helper.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/child_frame_compositing_helper.h"
 
 #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"
 #include "cc/output/context_provider.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/resources/single_release_callback.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/content_switches_internal.h"
@@ skipping 91 matching lines @@
     layer->SetBounds(device_scale_adjusted_size);
   }
 }
 
 void ChildFrameCompositingHelper::OnContainerDestroy() {
   UpdateWebLayer(nullptr);
 }
 
 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);
 
   if (web_layer_) {
     SkBitmap* sad_bitmap =
         GetContentClient()->renderer()->GetSadWebViewBitmap();
     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);
       sad_layer->SetBounds(
           gfx::Size(sad_bitmap->width(), sad_bitmap->height()));
       sad_layer->SetPosition(gfx::PointF(
           (web_layer_->bounds().width - sad_bitmap->width()) / 2,
           (web_layer_->bounds().height - sad_bitmap->height()) / 2));
       sad_layer->SetIsDrawable(true);
 
@@ skipping 63 matching lines @@
                 browser_plugin_->browser_plugin_instance_id());
   cc::SurfaceLayer::RequireCallback require_callback =
       render_frame_proxy_
           ? base::Bind(&ChildFrameCompositingHelper::RequireCallback, sender,
                        host_routing_id_)
           : base::Bind(
                 &ChildFrameCompositingHelper::RequireCallbackBrowserPlugin,
                 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/.
   if (IsUseZoomForDSFEnabled())
     scale_factor = 1.0f;
 
   surface_layer->SetSurfaceId(surface_id, scale_factor, frame_size);
   surface_layer->SetMasksToBounds(true);
   blink::WebLayer* layer = new cc_blink::WebLayerImpl(surface_layer);
   UpdateWebLayer(layer);
@@ skipping 15 matching lines @@
       frame_size, scale_factor,
       static_cast<cc_blink::WebLayerImpl*>(web_layer_.get())->layer());
 }
 
 void ChildFrameCompositingHelper::UpdateVisibility(bool visible) {
   if (web_layer_)
     web_layer_->setDrawsContent(visible);
 }
 
 }  // namespace content