Remove unused transparency display items.

With the brand new Compositing display items, we no longer need these
transparency methods. This patch depends on a blink-side patch:
https://codereview.chromium.org/953143003.

Review URL: https://codereview.chromium.org/956813002

Cr-Commit-Position: refs/heads/master@{#318152}

cc/BUILD.gn

@@ -475,8 +475,6 @@ component("cc") {
     "resources/transferable_resource.h",
     "resources/transform_display_item.cc",
     "resources/transform_display_item.h",
-    "resources/transparency_display_item.cc",
-    "resources/transparency_display_item.h",
     "resources/ui_resource_bitmap.cc",
     "resources/ui_resource_bitmap.h",
     "resources/ui_resource_client.h",

cc/blink/web_display_item_list_impl.cc

@@ -15,7 +15,6 @@
 #include "cc/resources/filter_display_item.h"
 #include "cc/resources/float_clip_display_item.h"
 #include "cc/resources/transform_display_item.h"
-#include "cc/resources/transparency_display_item.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
@@ -85,19 +84,6 @@ void WebDisplayItemListImpl::appendEndTransformItem() {
   display_item_list_->AppendItem(cc::EndTransformDisplayItem::Create());
 }
 
-// TODO(pdr): Remove once there are no more callers.
-void WebDisplayItemListImpl::appendTransparencyItem(
-    float opacity,
-    blink::WebBlendMode blend_mode) {
-  display_item_list_->AppendItem(cc::TransparencyDisplayItem::Create(
-      opacity, BlendModeToSkia(blend_mode)));
-}
-
-// TODO(pdr): Remove once there are no more callers.
-void WebDisplayItemListImpl::appendEndTransparencyItem() {
-  display_item_list_->AppendItem(cc::EndTransparencyDisplayItem::Create());
-}
-
 // TODO(pdr): Remove this once the blink-side callers have been removed.
 void WebDisplayItemListImpl::appendCompositingItem(
     float opacity,

cc/blink/web_display_item_list_impl.h

@@ -47,9 +47,6 @@ class WebDisplayItemListImpl : public blink::WebDisplayItemList {
   virtual void appendEndFloatClipItem();
   virtual void appendTransformItem(const SkMatrix44& matrix);
   virtual void appendEndTransformItem();
-  virtual void appendTransparencyItem(float opacity,
-                                      blink::WebBlendMode blend_mode);
-  virtual void appendEndTransparencyItem();
   // TODO(pdr): Remove this once the blink-side callers have been removed.
   virtual void appendCompositingItem(float opacity,
                                      SkXfermode::Mode,

cc/cc.gyp

@@ -502,8 +502,6 @@
         'resources/transferable_resource.h',
         'resources/transform_display_item.cc',
         'resources/transform_display_item.h',
-        'resources/transparency_display_item.cc',
-        'resources/transparency_display_item.h',
         'resources/ui_resource_bitmap.cc',
         'resources/ui_resource_bitmap.h',
         'resources/ui_resource_client.h',

cc/resources/transparency_display_item.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 "cc/resources/transparency_display_item.h"
-
-#include "base/strings/stringprintf.h"
-#include "base/trace_event/trace_event_argument.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkXfermode.h"
-#include "ui/gfx/skia_util.h"
-
-namespace cc {
-
-TransparencyDisplayItem::TransparencyDisplayItem(float opacity,
-                                                 SkXfermode::Mode blend_mode)
-    : opacity_(opacity), blend_mode_(blend_mode) {
-}
-
-TransparencyDisplayItem::~TransparencyDisplayItem() {
-}
-
-void TransparencyDisplayItem::Raster(SkCanvas* canvas,
-                                     SkDrawPictureCallback* callback) const {
-  SkPaint paint;
-  paint.setXfermodeMode(blend_mode_);
-  paint.setAlpha(opacity_ * 255);
-  canvas->saveLayer(NULL, &paint);
-}
-
-bool TransparencyDisplayItem::IsSuitableForGpuRasterization() const {
-  return true;
-}
-
-int TransparencyDisplayItem::ApproximateOpCount() const {
-  return 1;
-}
-
-size_t TransparencyDisplayItem::PictureMemoryUsage() const {
-  return sizeof(float) + sizeof(SkXfermode::Mode);
-}
-
-void TransparencyDisplayItem::AsValueInto(
-    base::trace_event::TracedValue* array) const {
-  array->AppendString(
-      base::StringPrintf("TransparencyDisplayItem opacity: %f, blend_mode: %d",
-                         opacity_, blend_mode_));
-}
-
-EndTransparencyDisplayItem::EndTransparencyDisplayItem() {
-}
-
-EndTransparencyDisplayItem::~EndTransparencyDisplayItem() {
-}
-
-void EndTransparencyDisplayItem::Raster(SkCanvas* canvas,
-                                        SkDrawPictureCallback* callback) const {
-  canvas->restore();
-}
-
-bool EndTransparencyDisplayItem::IsSuitableForGpuRasterization() const {
-  return true;
-}
-
-int EndTransparencyDisplayItem::ApproximateOpCount() const {
-  return 0;
-}
-
-size_t EndTransparencyDisplayItem::PictureMemoryUsage() const {
-  return 0;
-}
-
-void EndTransparencyDisplayItem::AsValueInto(
-    base::trace_event::TracedValue* array) const {
-  array->AppendString("EndTransparencyDisplayItem");
-}
-
-}  // namespace cc

cc/resources/transparency_display_item.h

-// 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.
-
-#ifndef CC_RESOURCES_TRANSPARENCY_DISPLAY_ITEM_H_
-#define CC_RESOURCES_TRANSPARENCY_DISPLAY_ITEM_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "cc/base/cc_export.h"
-#include "cc/resources/display_item.h"
-#include "skia/ext/refptr.h"
-#include "third_party/skia/include/core/SkXfermode.h"
-#include "ui/gfx/geometry/rect_f.h"
-
-class SkCanvas;
-class SkDrawPictureCallback;
-
-namespace cc {
-
-class CC_EXPORT TransparencyDisplayItem : public DisplayItem {
- public:
-  ~TransparencyDisplayItem() override;
-
-  static scoped_ptr<TransparencyDisplayItem> Create(
-      float opacity,
-      SkXfermode::Mode blend_mode) {
-    return make_scoped_ptr(new TransparencyDisplayItem(opacity, blend_mode));
-  }
-
-  void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override;
-
-  bool IsSuitableForGpuRasterization() const override;
-  int ApproximateOpCount() const override;
-  size_t PictureMemoryUsage() const override;
-  void AsValueInto(base::trace_event::TracedValue* array) const override;
-
- protected:
-  TransparencyDisplayItem(float opacity, SkXfermode::Mode blend_mode);
-
- private:
-  float opacity_;
-  SkXfermode::Mode blend_mode_;
-};
-
-class CC_EXPORT EndTransparencyDisplayItem : public DisplayItem {
- public:
-  ~EndTransparencyDisplayItem() override;
-
-  static scoped_ptr<EndTransparencyDisplayItem> Create() {
-    return make_scoped_ptr(new EndTransparencyDisplayItem());
-  }
-
-  void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override;
-
-  bool IsSuitableForGpuRasterization() const override;
-  int ApproximateOpCount() const override;
-  size_t PictureMemoryUsage() const override;
-  void AsValueInto(base::trace_event::TracedValue* array) const override;
-
- protected:
-  EndTransparencyDisplayItem();
-};
-
-}  // namespace cc
-
-#endif  // CC_RESOURCES_TRANSPARENCY_DISPLAY_ITEM_H_