Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: gpu/command_buffer/service/buffer_manager.cc

Issue 16293004: Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/buffer_manager.h" 5 #include "gpu/command_buffer/service/buffer_manager.h"
6 #include <limits> 6 #include <limits>
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 9 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
10 #include "gpu/command_buffer/service/error_state.h" 10 #include "gpu/command_buffer/service/error_state.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 Buffer* BufferManager::GetBuffer( 50 Buffer* BufferManager::GetBuffer(
51 GLuint client_id) { 51 GLuint client_id) {
52 BufferMap::iterator it = buffers_.find(client_id); 52 BufferMap::iterator it = buffers_.find(client_id);
53 return it != buffers_.end() ? it->second : NULL; 53 return it != buffers_.end() ? it->second : NULL;
54 } 54 }
55 55
56 void BufferManager::RemoveBuffer(GLuint client_id) { 56 void BufferManager::RemoveBuffer(GLuint client_id) {
57 BufferMap::iterator it = buffers_.find(client_id); 57 BufferMap::iterator it = buffers_.find(client_id);
58 if (it != buffers_.end()) { 58 if (it != buffers_.end()) {
59 Buffer* buffer = it->second; 59 Buffer* buffer = it->second.get();
60 buffer->MarkAsDeleted(); 60 buffer->MarkAsDeleted();
61 buffers_.erase(it); 61 buffers_.erase(it);
62 } 62 }
63 } 63 }
64 64
65 void BufferManager::StartTracking(Buffer* /* buffer */) { 65 void BufferManager::StartTracking(Buffer* /* buffer */) {
66 ++buffer_count_; 66 ++buffer_count_;
67 } 67 }
68 68
69 void BufferManager::StopTracking(Buffer* buffer) { 69 void BufferManager::StopTracking(Buffer* buffer) {
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 if (buffer->target() == 0) { 306 if (buffer->target() == 0) {
307 buffer->set_target(target); 307 buffer->set_target(target);
308 } 308 }
309 return true; 309 return true;
310 } 310 }
311 311
312 } // namespace gles2 312 } // namespace gles2
313 } // namespace gpu 313 } // namespace gpu
314 314
315 315
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698