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

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

Issue 17948002: Update Linux 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, 5 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/framebuffer_manager.h" 5 #include "gpu/command_buffer/service/framebuffer_manager.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 8 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
9 #include "gpu/command_buffer/service/renderbuffer_manager.h" 9 #include "gpu/command_buffer/service/renderbuffer_manager.h"
10 #include "gpu/command_buffer/service/texture_manager.h" 10 #include "gpu/command_buffer/service/texture_manager.h"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 done = false; 508 done = false;
509 break; 509 break;
510 } 510 }
511 } 511 }
512 } while (!done); 512 } while (!done);
513 } 513 }
514 514
515 Framebuffer* FramebufferManager::GetFramebuffer( 515 Framebuffer* FramebufferManager::GetFramebuffer(
516 GLuint client_id) { 516 GLuint client_id) {
517 FramebufferMap::iterator it = framebuffers_.find(client_id); 517 FramebufferMap::iterator it = framebuffers_.find(client_id);
518 return it != framebuffers_.end() ? it->second : NULL; 518 return it != framebuffers_.end() ? it->second.get() : NULL;
519 } 519 }
520 520
521 void FramebufferManager::RemoveFramebuffer(GLuint client_id) { 521 void FramebufferManager::RemoveFramebuffer(GLuint client_id) {
522 FramebufferMap::iterator it = framebuffers_.find(client_id); 522 FramebufferMap::iterator it = framebuffers_.find(client_id);
523 if (it != framebuffers_.end()) { 523 if (it != framebuffers_.end()) {
524 it->second->MarkAsDeleted(); 524 it->second->MarkAsDeleted();
525 framebuffers_.erase(it); 525 framebuffers_.erase(it);
526 } 526 }
527 } 527 }
528 528
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 Framebuffer* framebuffer) { 600 Framebuffer* framebuffer) {
601 DCHECK(framebuffer); 601 DCHECK(framebuffer);
602 return framebuffer->framebuffer_complete_state_count_id() == 602 return framebuffer->framebuffer_complete_state_count_id() ==
603 framebuffer_state_change_count_; 603 framebuffer_state_change_count_;
604 } 604 }
605 605
606 } // namespace gles2 606 } // namespace gles2
607 } // namespace gpu 607 } // namespace gpu
608 608
609 609
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/buffer_manager.cc ('k') | gpu/command_buffer/service/program_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698