summaryrefslogtreecommitdiffstats
path: root/content/common/gpu/gpu_command_buffer_stub.h
diff options
context:
space:
mode:
authorericrk <ericrk@chromium.org>2015-07-21 14:06:19 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-21 21:06:43 +0000
commitbe3028d759f1ef49520f3466b92656af36e7c1de (patch)
tree070d6c8795b80e685905ef676d47c98bf612e9c3 /content/common/gpu/gpu_command_buffer_stub.h
parentcce531ce2d0797205a749cc13b701d882334dec8 (diff)
downloadchromium_src-be3028d759f1ef49520f3466b92656af36e7c1de.zip
chromium_src-be3028d759f1ef49520f3466b92656af36e7c1de.tar.gz
chromium_src-be3028d759f1ef49520f3466b92656af36e7c1de.tar.bz2
Avoid double-counting in GpuChannel memory tracking.
GpuChannel currently calculates current memory usage by iterating over all stubs and summing their individual memory usage. This results in double counting as a given stub may share its memory tracker with other stubs, if they are in a share group. To avoid double counting, we now iterate over stubs to collect a set of unique MemoryTrackers, then sum the memory usage of each unique tracker. BUG=512535 Review URL: https://codereview.chromium.org/1244843004 Cr-Commit-Position: refs/heads/master@{#339746}
Diffstat (limited to 'content/common/gpu/gpu_command_buffer_stub.h')
-rw-r--r--content/common/gpu/gpu_command_buffer_stub.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index e19c320..ed9d565 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -148,8 +148,6 @@ class GpuCommandBufferStub
const gpu::gles2::FeatureInfo* GetFeatureInfo() const;
- uint64 GetMemoryUsage() const;
-
void SendSwapBuffersCompleted(
const std::vector<ui::LatencyInfo>& latency_info,
gfx::SwapResult result);