gpu::MemoryTracker use int64_t delta

To prevent confusion whether delta can be negative.

Change-Id: I6c2f3fc31347c0a0af55fb2b9d91ab364d56370c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954319
Commit-Queue: Kramer Ge <fangzhoug@chromium.org>
Reviewed-by: Peng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#722510}

components/viz/service/display_embedder/skia_output_device_buffer_queue_unittest.cc

@@ -153,7 +153,11 @@ class MemoryTrackerStub : public gpu::MemoryTracker {
   ~MemoryTrackerStub() override { DCHECK(!size_); }
 
   // MemoryTracker implementation:
-  void TrackMemoryAllocatedChange(uint64_t delta) override { size_ += delta; }
+  void TrackMemoryAllocatedChange(int64_t delta) override {
+    DCHECK(delta >= 0 || size_ >= static_cast<uint64_t>(-delta));
+    size_ += delta;
+  }
+
   uint64_t GetSize() const override { return size_; }
   uint64_t ClientTracingId() const override { return client_tracing_id_; }
   int ClientId() const override {

components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc

@@ -130,7 +130,8 @@ class SharedImageSubMemoryTracker : public gpu::MemoryTracker {
   ~SharedImageSubMemoryTracker() override { DCHECK(!size_); }
 
   // MemoryTracker implementation:
-  void TrackMemoryAllocatedChange(uint64_t delta) override {
+  void TrackMemoryAllocatedChange(int64_t delta) override {
+    DCHECK(delta >= 0 || size_ >= static_cast<uint64_t>(-delta));
     uint64_t old_size = size_;
     size_ += delta;
     DCHECK(observer_);

gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

@@ -1321,7 +1321,8 @@ class SizeOnlyMemoryTracker : public MemoryTracker {
   }
   ~SizeOnlyMemoryTracker() override = default;
 
-  void TrackMemoryAllocatedChange(uint64_t delta) override {
+  void TrackMemoryAllocatedChange(int64_t delta) override {
+    DCHECK(delta >= 0 || pool_info_.size >= static_cast<uint64_t>(-delta));
     pool_info_.size += delta;
   }
 

gpu/command_buffer/service/gpu_command_buffer_memory_tracker.cc

@@ -61,7 +61,8 @@ GpuCommandBufferMemoryTracker::~GpuCommandBufferMemoryTracker() {
   LogMemoryStatsShutdown();
 }
 
-void GpuCommandBufferMemoryTracker::TrackMemoryAllocatedChange(uint64_t delta) {
+void GpuCommandBufferMemoryTracker::TrackMemoryAllocatedChange(int64_t delta) {
+  DCHECK(delta >= 0 || size_ >= static_cast<uint64_t>(-delta));
   uint64_t old_size = size_;
   size_ += delta;
   if (observer_)

gpu/command_buffer/service/gpu_command_buffer_memory_tracker.h

@@ -30,7 +30,7 @@ class GPU_GLES2_EXPORT GpuCommandBufferMemoryTracker : public MemoryTracker {
   ~GpuCommandBufferMemoryTracker() override;
 
   // MemoryTracker implementation.
-  void TrackMemoryAllocatedChange(uint64_t delta) override;
+  void TrackMemoryAllocatedChange(int64_t delta) override;
   uint64_t GetSize() const override;
   uint64_t ClientTracingId() const override;
   int ClientId() const override;

gpu/command_buffer/service/memory_tracking.h

@@ -36,7 +36,7 @@ class MemoryTracker {
   };
 
   virtual ~MemoryTracker() = default;
-  virtual void TrackMemoryAllocatedChange(uint64_t delta) = 0;
+  virtual void TrackMemoryAllocatedChange(int64_t delta) = 0;
   virtual uint64_t GetSize() const = 0;
 
   // Raw ID identifying the GPU client for whom memory is being allocated.
@@ -61,17 +61,17 @@ class MemoryTypeTracker {
   ~MemoryTypeTracker() = default;
 
   void TrackMemAlloc(size_t bytes) {
+    DCHECK(bytes >= 0);
     mem_represented_ += bytes;
     if (memory_tracker_ && bytes)
       memory_tracker_->TrackMemoryAllocatedChange(bytes);
   }
 
   void TrackMemFree(size_t bytes) {
-    DCHECK(bytes <= mem_represented_);
+    DCHECK(bytes >= 0 && bytes <= mem_represented_);
     mem_represented_ -= bytes;
     if (memory_tracker_ && bytes) {
-      memory_tracker_->TrackMemoryAllocatedChange(
-          -static_cast<uint64_t>(bytes));
+      memory_tracker_->TrackMemoryAllocatedChange(-static_cast<int64_t>(bytes));
     }
   }
 

gpu/command_buffer/service/mocks.h

@@ -152,7 +152,7 @@ class MockMemoryTracker : public MemoryTracker {
   MockMemoryTracker();
   ~MockMemoryTracker() override;
 
-  MOCK_METHOD1(TrackMemoryAllocatedChange, void(uint64_t delta));
+  MOCK_METHOD1(TrackMemoryAllocatedChange, void(int64_t delta));
   uint64_t GetSize() const override { return 0; }
   MOCK_CONST_METHOD0(ClientTracingId, uint64_t());
   MOCK_CONST_METHOD0(ClientId, int());

gpu/command_buffer/service/texture_manager_unittest.cc

@@ -2186,7 +2186,8 @@ class CountingMemoryTracker : public MemoryTracker {
   }
   ~CountingMemoryTracker() override = default;
 
-  void TrackMemoryAllocatedChange(uint64_t delta) override {
+  void TrackMemoryAllocatedChange(int64_t delta) override {
+    DCHECK(delta >= 0 || current_size_ >= static_cast<uint64_t>(-delta));
     current_size_ += delta;
   }
 

gpu/ipc/service/shared_image_stub.cc

@@ -440,7 +440,8 @@ void SharedImageStub::OnError() {
   channel_->OnChannelError();
 }
 
-void SharedImageStub::TrackMemoryAllocatedChange(uint64_t delta) {
+void SharedImageStub::TrackMemoryAllocatedChange(int64_t delta) {
+  DCHECK(delta >= 0 || size_ >= static_cast<uint64_t>(-delta));
   uint64_t old_size = size_;
   size_ += delta;
   channel_->gpu_channel_manager()

gpu/ipc/service/shared_image_stub.h

@@ -40,7 +40,7 @@ class GPU_IPC_SERVICE_EXPORT SharedImageStub
   bool OnMessageReceived(const IPC::Message& msg) override;
 
   // MemoryTracker implementation:
-  void TrackMemoryAllocatedChange(uint64_t delta) override;
+  void TrackMemoryAllocatedChange(int64_t delta) override;
   uint64_t GetSize() const override;
   uint64_t ClientTracingId() const override;
   int ClientId() const override;