gpu/command_buffer/service/shader_manager.cc - Issue 16293004: Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/shader_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, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « gpu/command_buffer/service/renderbuffer_manager_unittest.cc ('k') | gpu/command_buffer/service/shader_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/shader_manager.cc

diff --git a/gpu/command_buffer/service/shader_manager.cc b/gpu/command_buffer/service/shader_manager.cc

index 58711d9ab3e93c397060390997b41598b1dbcce6..d2ad56e4bec5d3e3f3fc9b3b3f8e3611974ab493 100644

--- a/gpu/command_buffer/service/shader_manager.cc

+++ b/gpu/command_buffer/service/shader_manager.cc

@@ -93,7 +93,7 @@ ShaderManager::~ShaderManager() {

void ShaderManager::Destroy(bool have_context) {

while (!shaders_.empty()) {

if (have_context) {

- Shader* shader = shaders_.begin()->second;

+ Shader* shader = shaders_.begin()->second.get();

if (!shader->IsDeleted()) {

glDeleteShader(shader->service_id());

shader->MarkAsDeleted();

@@ -112,7 +112,7 @@ Shader* ShaderManager::CreateShader(

client_id, scoped_refptr<Shader>(

new Shader(service_id, shader_type))));

DCHECK(result.second);

- return result.first->second;

+ return result.first->second.get();

}

Shader* ShaderManager::GetShader(GLuint client_id) {