cc: Merge PictureImageLayerImpl and PictureLayerImpl.

cc/layers/picture_image_layer.cc

 // Copyright 2010 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 "cc/layers/picture_image_layer.h"
 
 #include <stddef.h>
 
-#include "cc/layers/picture_image_layer_impl.h"
+#include "cc/layers/picture_layer_impl.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/trees/layer_tree_host.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 scoped_refptr<PictureImageLayer> PictureImageLayer::Create() {
   return make_scoped_refptr(new PictureImageLayer());
 }
 
 PictureImageLayer::PictureImageLayer() : PictureLayer(this) {}
 
 PictureImageLayer::~PictureImageLayer() {
   ClearClient();
 }
 
 std::unique_ptr<LayerImpl> PictureImageLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
-  return PictureImageLayerImpl::Create(tree_impl, id(), is_mask());
+  auto layer_impl = PictureLayerImpl::Create(tree_impl, id(), is_mask());
+  layer_impl->set_is_directly_composited_image(true);
+  return std::move(layer_impl);
 }
 
 bool PictureImageLayer::HasDrawableContent() const {
   return image_ && PictureLayer::HasDrawableContent();
 }
 
 void PictureImageLayer::SetImage(sk_sp<const SkImage> image) {
   // SetImage() currently gets called whenever there is any
   // style change that affects the layer even if that change doesn't
   // affect the actual contents of the image (e.g. a CSS animation).
@@ skipping 47 matching lines @@
 
 bool PictureImageLayer::FillsBoundsCompletely() const {
   return false;
 }
 
 size_t PictureImageLayer::GetApproximateUnsharedMemoryUsage() const {
   return 0;
 }
 
 }  // namespace cc