cc: Merge PictureImageLayerImpl and PictureLayerImpl.

cc/layers/picture_image_layer_impl.h

Index: cc/layers/picture_image_layer_impl.h
diff --git a/cc/layers/picture_image_layer_impl.h b/cc/layers/picture_image_layer_impl.h
deleted file mode 100644
index 723990599e5b0e88c79bf7821ea3eb716ec66551..0000000000000000000000000000000000000000
--- a/cc/layers/picture_image_layer_impl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
-#define CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
-
-#include "base/macros.h"
-#include "base/memory/ptr_util.h"
-#include "cc/layers/picture_layer_impl.h"
-
-namespace cc {
-
-class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
- public:
-  static std::unique_ptr<PictureImageLayerImpl> Create(LayerTreeImpl* tree_impl,
-                                                       int id,
-                                                       bool is_mask) {
-    return base::WrapUnique(new PictureImageLayerImpl(tree_impl, id, is_mask));
-  }
-  ~PictureImageLayerImpl() override;
-
-  // LayerImpl overrides.
-  const char* LayerTypeAsString() const override;
-  std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
-
- protected:
-  PictureImageLayerImpl(LayerTreeImpl* tree_impl, int id, bool is_mask);
-
-  bool ShouldAdjustRasterScale() const override;
-  void RecalculateRasterScales() override;
-  void GetDebugBorderProperties(SkColor* color, float* width) const override;
-
-  void UpdateIdealScales() override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PictureImageLayerImpl);
-};
-
-}  // namespace cc
-
-#endif  // CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_