| Index: gpu/command_buffer/service/buffer_manager.cc
|
| diff --git a/gpu/command_buffer/service/buffer_manager.cc b/gpu/command_buffer/service/buffer_manager.cc
|
| index 864027dce48c38c395d63e2515069d09824ea45f..1fbf6b32ef4d78472ee87497adeeaa0041c09a1c 100644
|
| --- a/gpu/command_buffer/service/buffer_manager.cc
|
| +++ b/gpu/command_buffer/service/buffer_manager.cc
|
| @@ -7,14 +7,18 @@
|
| #include "base/logging.h"
|
| #include "gpu/command_buffer/common/gles2_cmd_utils.h"
|
| #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
|
| +#include "gpu/command_buffer/service/memory_tracking.h"
|
|
|
| namespace gpu {
|
| namespace gles2 {
|
|
|
| -BufferManager::BufferManager()
|
| - : allow_buffers_on_multiple_targets_(false),
|
| +BufferManager::BufferManager(MemoryTracker* memory_tracker)
|
| + : buffer_memory_tracker_(new MemoryTypeTracker(
|
| + memory_tracker,
|
| + "BufferManager",
|
| + "BufferMemory")),
|
| + allow_buffers_on_multiple_targets_(false),
|
| mem_represented_(0),
|
| - last_reported_mem_represented_(1),
|
| buffer_info_count_(0),
|
| have_context_(true) {
|
| UpdateMemRepresented();
|
| @@ -33,11 +37,7 @@ void BufferManager::Destroy(bool have_context) {
|
| }
|
|
|
| void BufferManager::UpdateMemRepresented() {
|
| - if (mem_represented_ != last_reported_mem_represented_) {
|
| - last_reported_mem_represented_ = mem_represented_;
|
| - TRACE_COUNTER_ID1(
|
| - "BufferManager", "BufferMemory", this, mem_represented_);
|
| - }
|
| + buffer_memory_tracker_->UpdateMemRepresented(mem_represented_);
|
| }
|
|
|
| void BufferManager::CreateBufferInfo(GLuint client_id, GLuint service_id) {
|
|
|