Revert "Dump DisplayListRasterSource memory"

cc/playback/raster_source.cc

Index: cc/playback/raster_source.cc
diff --git a/cc/playback/raster_source.cc b/cc/playback/raster_source.cc
index ab0fd5a333269e4e56a1d4e113166c48b28174cf..d8ce85a52fb42ae1edbe553216308bd0242be666 100644
--- a/cc/playback/raster_source.cc
+++ b/cc/playback/raster_source.cc
@@ -6,9 +6,6 @@
 
 #include <stddef.h>
 
-#include "base/strings/stringprintf.h"
-#include "base/thread_task_runner_handle.h"
-#include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
@@ -44,13 +41,6 @@ RasterSource::RasterSource(const RecordingSource* other, bool can_use_lcd_text)
           other->slow_down_raster_scale_factor_for_debug_),
       should_attempt_to_use_distance_field_text_(false),
       image_decode_controller_(nullptr) {
-  // In certain cases, ThreadTaskRunnerHandle isn't set (Android Webview).
-  // Don't register a dump provider in these cases.
-  // TODO(ericrk): Get this working in Android Webview. crbug.com/517156
-  if (base::ThreadTaskRunnerHandle::IsSet()) {
-    base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
-        this, "cc::RasterSource", base::ThreadTaskRunnerHandle::Get());
-  }
 }
 
 RasterSource::RasterSource(const RasterSource* other, bool can_use_lcd_text)
@@ -69,21 +59,9 @@ RasterSource::RasterSource(const RasterSource* other, bool can_use_lcd_text)
       should_attempt_to_use_distance_field_text_(
           other->should_attempt_to_use_distance_field_text_),
       image_decode_controller_(other->image_decode_controller_) {
-  // In certain cases, ThreadTaskRunnerHandle isn't set (Android Webview).
-  // Don't register a dump provider in these cases.
-  // TODO(ericrk): Get this working in Android Webview. crbug.com/517156
-  if (base::ThreadTaskRunnerHandle::IsSet()) {
-    base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
-        this, "cc::RasterSource", base::ThreadTaskRunnerHandle::Get());
-  }
 }
 
 RasterSource::~RasterSource() {
-  // For MemoryDumpProvider deregistration to work correctly, this must happen
-  // on the same thread that the RasterSource was created on.
-  DCHECK(memory_dump_thread_checker_.CalledOnValidThread());
-  base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
-      this);
 }
 
 void RasterSource::PlaybackToCanvas(SkCanvas* raster_canvas,
@@ -331,23 +309,6 @@ void RasterSource::SetImageDecodeController(
   image_decode_controller_ = image_decode_controller;
 }
 
-bool RasterSource::OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
-                                base::trace_event::ProcessMemoryDump* pmd) {
-  DCHECK(memory_dump_thread_checker_.CalledOnValidThread());
-
-  uint64_t memory_usage = GetPictureMemoryUsage();
-  if (memory_usage > 0) {
-    std::string dump_name =
-        base::StringPrintf("cc/display_lists/raster_source_%p", this);
-    base::trace_event::MemoryAllocatorDump* dump =
-        pmd->CreateAllocatorDump(dump_name);
-    dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
-                    base::trace_event::MemoryAllocatorDump::kUnitsBytes,
-                    memory_usage);
-  }
-  return true;
-}
-
 RasterSource::PlaybackSettings::PlaybackSettings()
     : playback_to_shared_canvas(false),
       skip_images(false),