| Index: content/renderer/pepper/pepper_compositor_host.cc
|
| diff --git a/content/renderer/pepper/pepper_compositor_host.cc b/content/renderer/pepper/pepper_compositor_host.cc
|
| index fa3ef5f60f4f0809432b0dba2182f37b7f6cd47c..59b6dc8170ce151cb2af614ec7c0e121aca359b8 100644
|
| --- a/content/renderer/pepper/pepper_compositor_host.cc
|
| +++ b/content/renderer/pepper/pepper_compositor_host.cc
|
| @@ -12,7 +12,6 @@
|
| #include "base/memory/shared_memory.h"
|
| #include "cc/blink/web_layer_impl.h"
|
| #include "cc/layers/layer.h"
|
| -#include "cc/layers/layer_settings.h"
|
| #include "cc/layers/solid_color_layer.h"
|
| #include "cc/layers/texture_layer.h"
|
| #include "cc/resources/texture_mailbox.h"
|
| @@ -157,7 +156,7 @@ PepperCompositorHost::PepperCompositorHost(
|
| : ResourceHost(host->GetPpapiHost(), instance, resource),
|
| bound_instance_(NULL),
|
| weak_factory_(this) {
|
| - layer_ = cc::Layer::Create(cc::LayerSettings());
|
| + layer_ = cc::Layer::Create();
|
| // TODO(penghuang): SetMasksToBounds() can be expensive if the layer is
|
| // transformed. Possibly better could be to explicitly clip the child layers
|
| // (by modifying their bounds).
|
| @@ -244,7 +243,7 @@ void PepperCompositorHost::UpdateLayer(
|
| scoped_refptr<cc::Layer> clip_parent = layer->parent();
|
| if (clip_parent.get() == layer_.get()) {
|
| // Create a clip parent layer, if it does not exist.
|
| - clip_parent = cc::Layer::Create(cc::LayerSettings());
|
| + clip_parent = cc::Layer::Create();
|
| clip_parent->SetMasksToBounds(true);
|
| clip_parent->SetIsDrawable(true);
|
| layer_->ReplaceChild(layer.get(), clip_parent);
|
| @@ -387,11 +386,9 @@ int32_t PepperCompositorHost::OnHostMsgCommitLayers(
|
|
|
| if (!cc_layer.get()) {
|
| if (pp_layer->color)
|
| - cc_layer = cc::SolidColorLayer::Create(
|
| - cc::LayerSettings());
|
| + cc_layer = cc::SolidColorLayer::Create();
|
| else if (pp_layer->texture || pp_layer->image)
|
| - cc_layer = cc::TextureLayer::CreateForMailbox(
|
| - cc::LayerSettings(), NULL);
|
| + cc_layer = cc::TextureLayer::CreateForMailbox(NULL);
|
| layer_->AddChild(cc_layer);
|
| }
|
|
|
|
|