From c14a3831d9daaaab0b84ef869bb700d25906a791 Mon Sep 17 00:00:00 2001 From: liberato Date: Mon, 8 Feb 2016 22:44:29 -0800 Subject: Updated owned_service_id_ in Texture::SetServiceId. [Merge to M49 of 6b8dce21c9768cea2ba4916d68269c4383b132a2] When Texture::SetServiceId is called, it now updates |owned_service_id_|, so that destruction works properly. This affects TextureDefinition::UpdateTexture and doSwapBuffers. BUG=578998 NOTRY=true NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1662033002 Cr-Commit-Position: refs/branch-heads/2623@{#326} Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907} --- gpu/command_buffer/service/texture_manager.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gpu') diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h index 5a07d99..bb6a2a2 100644 --- a/gpu/command_buffer/service/texture_manager.h +++ b/gpu/command_buffer/service/texture_manager.h @@ -125,7 +125,9 @@ class GPU_EXPORT Texture { void SetServiceId(GLuint service_id) { DCHECK(service_id); + DCHECK_EQ(owned_service_id_, service_id_); service_id_ = service_id; + owned_service_id_ = service_id; } // Causes us to report |service_id| as our service id, but does not delete -- cgit v1.1