summaryrefslogtreecommitdiff
path: root/chromium/cc/raster/bitmap_raster_buffer_provider.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/cc/raster/bitmap_raster_buffer_provider.cc')
-rw-r--r--chromium/cc/raster/bitmap_raster_buffer_provider.cc24
1 files changed, 15 insertions, 9 deletions
diff --git a/chromium/cc/raster/bitmap_raster_buffer_provider.cc b/chromium/cc/raster/bitmap_raster_buffer_provider.cc
index c801facce0e..12eaae7efa7 100644
--- a/chromium/cc/raster/bitmap_raster_buffer_provider.cc
+++ b/chromium/cc/raster/bitmap_raster_buffer_provider.cc
@@ -11,6 +11,7 @@
#include "base/macros.h"
#include "base/strings/stringprintf.h"
+#include "base/trace_event/process_memory_dump.h"
#include "base/trace_event/trace_event.h"
#include "base/trace_event/trace_event_argument.h"
#include "cc/raster/raster_source.h"
@@ -27,8 +28,13 @@ class BitmapSoftwareBacking : public ResourcePool::SoftwareBacking {
frame_sink->DidDeleteSharedBitmap(shared_bitmap_id);
}
- base::UnguessableToken SharedMemoryGuid() override {
- return shared_memory->mapped_id();
+ void OnMemoryDump(
+ base::trace_event::ProcessMemoryDump* pmd,
+ const base::trace_event::MemoryAllocatorDumpGuid& buffer_dump_guid,
+ uint64_t tracing_process_id,
+ int importance) const override {
+ pmd->CreateSharedMemoryOwnershipEdge(
+ buffer_dump_guid, shared_memory->mapped_id(), importance);
}
LayerTreeFrameSink* frame_sink;
@@ -50,13 +56,13 @@ class BitmapRasterBufferImpl : public RasterBuffer {
}
// Overridden from RasterBuffer:
- void Playback(
- const RasterSource* raster_source,
- const gfx::Rect& raster_full_rect,
- const gfx::Rect& raster_dirty_rect,
- uint64_t new_content_id,
- const gfx::AxisTransform2d& transform,
- const RasterSource::PlaybackSettings& playback_settings) override {
+ void Playback(const RasterSource* raster_source,
+ const gfx::Rect& raster_full_rect,
+ const gfx::Rect& raster_dirty_rect,
+ uint64_t new_content_id,
+ const gfx::AxisTransform2d& transform,
+ const RasterSource::PlaybackSettings& playback_settings,
+ const GURL& url) override {
TRACE_EVENT0("cc", "BitmapRasterBuffer::Playback");
gfx::Rect playback_rect = raster_full_rect;
if (resource_has_previous_content_) {