Revert "Speculative revert by sheriff"

This reverts commit 919dce4400651813d5ff6e8a85b944a5987adcb7.

BUG=None
TBR=akuegel

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

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

6 files changed, 11 insertions, 21 deletions

diff --git a/cc/blink/web_compositor_support_impl.cc b/cc/blink/web_compositor_support_impl.cc
index e335ba3..e69abf6 100644
--- a/cc/blink/web_compositor_support_impl.cc
+++ b/cc/blink/web_compositor_support_impl.cc
@@ -93,10 +93,6 @@ WebScrollbarLayer* WebCompositorSupportImpl::createSolidColorScrollbarLayer(
                                    is_left_side_vertical_scrollbar);
 }
 
-WebDisplayItemList* WebCompositorSupportImpl::createDisplayItemList() {
-  return new WebDisplayItemListImpl();
-}
-
 WebCompositorAnimation* WebCompositorSupportImpl::createAnimation(
     const blink::WebCompositorAnimationCurve& curve,
     blink::WebCompositorAnimation::TargetProperty target,
diff --git a/cc/blink/web_compositor_support_impl.h b/cc/blink/web_compositor_support_impl.h
index 4b41691..b924be9 100644
--- a/cc/blink/web_compositor_support_impl.h
+++ b/cc/blink/web_compositor_support_impl.h
@@ -42,7 +42,6 @@ class CC_BLINK_EXPORT WebCompositorSupportImpl
       int thumb_thickness,
       int track_start,
       bool is_left_side_vertical_scrollbar);
-  virtual blink::WebDisplayItemList* createDisplayItemList();
   virtual blink::WebCompositorAnimation* createAnimation(
       const blink::WebCompositorAnimationCurve& curve,
       blink::WebCompositorAnimation::TargetProperty target,
diff --git a/cc/blink/web_content_layer_impl.cc b/cc/blink/web_content_layer_impl.cc
index 92242230..90d7f9b 100644
--- a/cc/blink/web_content_layer_impl.cc
+++ b/cc/blink/web_content_layer_impl.cc
@@ -72,16 +72,15 @@ void WebContentLayerImpl::PaintContents(
   client_->paintContents(canvas, clip, PaintingControlToWeb(painting_control));
 }
 
-scoped_refptr<cc::DisplayItemList>
-WebContentLayerImpl::PaintContentsToDisplayList(
+void WebContentLayerImpl::PaintContentsToDisplayList(
+    cc::DisplayItemList* display_list,
     const gfx::Rect& clip,
     cc::ContentLayerClient::PaintingControlSetting painting_control) {
   if (!client_)
-    return cc::DisplayItemList::Create();
+    return;
 
-  WebDisplayItemListImpl list;
+  WebDisplayItemListImpl list(display_list);
   client_->paintContents(&list, clip, PaintingControlToWeb(painting_control));
-  return list.ToDisplayItemList();
 }
 
 bool WebContentLayerImpl::FillsBoundsCompletely() const {
diff --git a/cc/blink/web_content_layer_impl.h b/cc/blink/web_content_layer_impl.h
index 3e7b55c..e7b04b0 100644
--- a/cc/blink/web_content_layer_impl.h
+++ b/cc/blink/web_content_layer_impl.h
@@ -39,7 +39,8 @@ class WebContentLayerImpl : public blink::WebContentLayer,
   void PaintContents(SkCanvas* canvas,
                      const gfx::Rect& clip,
                      PaintingControlSetting painting_control) override;
-  scoped_refptr<cc::DisplayItemList> PaintContentsToDisplayList(
+  void PaintContentsToDisplayList(
+      cc::DisplayItemList* display_list,
       const gfx::Rect& clip,
       PaintingControlSetting painting_control) override;
   bool FillsBoundsCompletely() const override;
diff --git a/cc/blink/web_display_item_list_impl.cc b/cc/blink/web_display_item_list_impl.cc
index a253beb..2bad804 100644
--- a/cc/blink/web_display_item_list_impl.cc
+++ b/cc/blink/web_display_item_list_impl.cc
@@ -25,12 +25,9 @@
 
 namespace cc_blink {
 
-WebDisplayItemListImpl::WebDisplayItemListImpl()
-    : display_item_list_(cc::DisplayItemList::Create()) {
-}
-
-scoped_refptr<cc::DisplayItemList> WebDisplayItemListImpl::ToDisplayItemList() {
-  return display_item_list_;
+WebDisplayItemListImpl::WebDisplayItemListImpl(
+    cc::DisplayItemList* display_list)
+    : display_item_list_(display_list) {
 }
 
 void WebDisplayItemListImpl::appendDrawingItem(const SkPicture* picture) {
diff --git a/cc/blink/web_display_item_list_impl.h b/cc/blink/web_display_item_list_impl.h
index abaf221..ff94ee3 100644
--- a/cc/blink/web_display_item_list_impl.h
+++ b/cc/blink/web_display_item_list_impl.h
@@ -31,11 +31,9 @@ namespace cc_blink {
 
 class WebDisplayItemListImpl : public blink::WebDisplayItemList {
  public:
-  CC_BLINK_EXPORT WebDisplayItemListImpl();
+  CC_BLINK_EXPORT WebDisplayItemListImpl(cc::DisplayItemList* display_list);
   virtual ~WebDisplayItemListImpl();
 
-  scoped_refptr<cc::DisplayItemList> ToDisplayItemList();
-
   // blink::WebDisplayItemList implementation.
   virtual void appendDrawingItem(const SkPicture*);
   virtual void appendClipItem(
@@ -63,7 +61,7 @@ class WebDisplayItemListImpl : public blink::WebDisplayItemList {
   virtual void appendEndScrollItem();
 
  private:
-  scoped_refptr<cc::DisplayItemList> display_item_list_;
+  cc::DisplayItemList* display_item_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDisplayItemListImpl);
 };