| Index: gpu/command_buffer/service/renderbuffer_manager.cc
|
| diff --git a/gpu/command_buffer/service/renderbuffer_manager.cc b/gpu/command_buffer/service/renderbuffer_manager.cc
|
| index 496b746c9c2733b8672a35b5e3740333b8707dc8..810b3334d164afecbc69d04d89cd7ed1cf4968c1 100644
|
| --- a/gpu/command_buffer/service/renderbuffer_manager.cc
|
| +++ b/gpu/command_buffer/service/renderbuffer_manager.cc
|
| @@ -17,14 +17,14 @@ RenderbufferManager::RenderbufferManager(
|
| MemoryTracker* memory_tracker,
|
| GLint max_renderbuffer_size,
|
| GLint max_samples)
|
| - : renderbuffer_memory_tracker_(new MemoryTypeTracker(memory_tracker)),
|
| + : memory_tracker_(
|
| + new MemoryTypeTracker(memory_tracker, MemoryTracker::Unmanaged)),
|
| max_renderbuffer_size_(max_renderbuffer_size),
|
| max_samples_(max_samples),
|
| num_uncleared_renderbuffers_(0),
|
| - mem_represented_(0),
|
| renderbuffer_info_count_(0),
|
| have_context_(true) {
|
| - UpdateMemRepresented();
|
| + memory_tracker_->UpdateMemRepresented();
|
| }
|
|
|
| RenderbufferManager::~RenderbufferManager() {
|
| @@ -60,16 +60,11 @@ RenderbufferManager::RenderbufferInfo::~RenderbufferInfo() {
|
| }
|
| }
|
|
|
| -
|
| -void RenderbufferManager::UpdateMemRepresented() {
|
| - renderbuffer_memory_tracker_->UpdateMemRepresented(mem_represented_);
|
| -}
|
| -
|
| void RenderbufferManager::Destroy(bool have_context) {
|
| have_context_ = have_context;
|
| renderbuffer_infos_.clear();
|
| - DCHECK_EQ(0u, mem_represented_);
|
| - UpdateMemRepresented();
|
| + DCHECK_EQ(0u, memory_tracker_->GetMemRepresented());
|
| + memory_tracker_->UpdateMemRepresented();
|
| }
|
|
|
| void RenderbufferManager::StartTracking(RenderbufferInfo* /* renderbuffer */) {
|
| @@ -81,7 +76,8 @@ void RenderbufferManager::StopTracking(RenderbufferInfo* renderbuffer) {
|
| if (!renderbuffer->cleared()) {
|
| --num_uncleared_renderbuffers_;
|
| }
|
| - mem_represented_ -= renderbuffer->EstimatedSize();
|
| + memory_tracker_->TrackMemFree(renderbuffer->EstimatedSize());
|
| + memory_tracker_->UpdateMemRepresented();
|
| }
|
|
|
| void RenderbufferManager::SetInfo(
|
| @@ -91,10 +87,10 @@ void RenderbufferManager::SetInfo(
|
| if (!renderbuffer->cleared()) {
|
| --num_uncleared_renderbuffers_;
|
| }
|
| - mem_represented_ -= renderbuffer->EstimatedSize();
|
| + memory_tracker_->TrackMemFree(renderbuffer->EstimatedSize());
|
| renderbuffer->SetInfo(samples, internalformat, width, height);
|
| - mem_represented_ += renderbuffer->EstimatedSize();
|
| - UpdateMemRepresented();
|
| + memory_tracker_->TrackMemAlloc(renderbuffer->EstimatedSize());
|
| + memory_tracker_->UpdateMemRepresented();
|
| if (!renderbuffer->cleared()) {
|
| ++num_uncleared_renderbuffers_;
|
| }
|
|
|