Revert "Dump DisplayListRasterSource memory"

cc/playback/raster_source.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_PLAYBACK_RASTER_SOURCE_H_
 #define CC_PLAYBACK_RASTER_SOURCE_H_
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/threading/thread_checker.h"
-#include "base/trace_event/memory_allocator_dump.h"
-#include "base/trace_event/memory_dump_provider.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/playback/recording_source.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace cc {
 class DisplayItemList;
 class DrawImage;
 class ImageDecodeController;
 
-class CC_EXPORT RasterSource : public base::trace_event::MemoryDumpProvider,
-                               public base::RefCountedThreadSafe<RasterSource> {
+class CC_EXPORT RasterSource : public base::RefCountedThreadSafe<RasterSource> {
  public:
   struct CC_EXPORT PlaybackSettings {
     PlaybackSettings();
 
     // If set to true, this indicates that the canvas has already been
     // rasterized into. This means that the canvas cannot be cleared safely.
     bool playback_to_shared_canvas;
 
     // If set to true, none of the images will be rasterized.
     bool skip_images;
@@ skipping 73 matching lines @@
 
   // Return true if LCD anti-aliasing may be used when rastering text.
   virtual bool CanUseLCDText() const;
 
   scoped_refptr<RasterSource> CreateCloneWithoutLCDText() const;
 
   // Image decode controller should be set once. Its lifetime has to exceed that
   // of the raster source, since the raster source will access it during raster.
   void SetImageDecodeController(ImageDecodeController* image_decode_controller);
 
-  // base::trace_event::MemoryDumpProvider implementation
-  bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
-                    base::trace_event::ProcessMemoryDump* pmd) override;
-
  protected:
   friend class base::RefCountedThreadSafe<RasterSource>;
 
   RasterSource(const RecordingSource* other, bool can_use_lcd_text);
   RasterSource(const RasterSource* other, bool can_use_lcd_text);
-  ~RasterSource() override;
+  virtual ~RasterSource();
 
   // These members are const as this raster source may be in use on another
   // thread and so should not be touched after construction.
   const scoped_refptr<DisplayItemList> display_list_;
   const size_t painter_reported_memory_usage_;
   const SkColor background_color_;
   const bool requires_clear_;
   const bool can_use_lcd_text_;
   const bool is_solid_color_;
   const SkColor solid_color_;
@@ skipping 14 matching lines @@
                     SkPicture::AbortCallback* callback,
                     const gfx::Rect& canvas_bitmap_rect,
                     const gfx::Rect& canvas_playback_rect,
                     float contents_scale) const;
 
   void PrepareForPlaybackToCanvas(SkCanvas* canvas,
                                   const gfx::Rect& canvas_bitmap_rect,
                                   const gfx::Rect& canvas_playback_rect,
                                   float contents_scale) const;
 
-  // Used to ensure that memory dump logic always happens on the same thread.
-  base::ThreadChecker memory_dump_thread_checker_;
-
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_RASTER_SOURCE_H_