| OLD | NEW |
| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/hash.h" | 9 #include "base/hash.h" |
| 10 #include "base/memory/shared_memory.h" | 10 #include "base/memory/shared_memory.h" |
| (...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 939 if (!image) | 939 if (!image) |
| 940 return; | 940 return; |
| 941 | 941 |
| 942 // For Android specific workaround. | 942 // For Android specific workaround. |
| 943 if (context_group_->feature_info()->workarounds().release_image_after_use) | 943 if (context_group_->feature_info()->workarounds().release_image_after_use) |
| 944 image->SetReleaseAfterUse(); | 944 image->SetReleaseAfterUse(); |
| 945 | 945 |
| 946 if (decoder_) { | 946 if (decoder_) { |
| 947 gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager(); | 947 gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager(); |
| 948 DCHECK(image_manager); | 948 DCHECK(image_manager); |
| 949 image_manager->AddImage(image.get(), id); | 949 if (!image_manager->AddImage(image.get(), id)) |
| 950 return; |
| 950 } | 951 } |
| 951 } | 952 } |
| 952 | 953 |
| 953 void GpuCommandBufferStub::OnDestroyGpuMemoryBuffer(int32 id) { | 954 void GpuCommandBufferStub::OnDestroyGpuMemoryBuffer(int32 id) { |
| 954 TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnDestroyGpuMemoryBuffer"); | 955 TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnDestroyGpuMemoryBuffer"); |
| 955 | 956 |
| 956 if (decoder_) { | 957 if (decoder_) { |
| 957 gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager(); | 958 gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager(); |
| 958 DCHECK(image_manager); | 959 DCHECK(image_manager); |
| 959 image_manager->RemoveImage(id); | 960 if (!image_manager->RemoveImage(id)) |
| 961 return; |
| 960 } | 962 } |
| 961 } | 963 } |
| 962 | 964 |
| 963 void GpuCommandBufferStub::SendConsoleMessage( | 965 void GpuCommandBufferStub::SendConsoleMessage( |
| 964 int32 id, | 966 int32 id, |
| 965 const std::string& message) { | 967 const std::string& message) { |
| 966 GPUCommandBufferConsoleMessage console_message; | 968 GPUCommandBufferConsoleMessage console_message; |
| 967 console_message.id = id; | 969 console_message.id = id; |
| 968 console_message.message = message; | 970 console_message.message = message; |
| 969 IPC::Message* msg = new GpuCommandBufferMsg_ConsoleMsg( | 971 IPC::Message* msg = new GpuCommandBufferMsg_ConsoleMsg( |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1052 if (decoder_) | 1054 if (decoder_) |
| 1053 decoder_->LoseContext(GL_UNKNOWN_CONTEXT_RESET_ARB); | 1055 decoder_->LoseContext(GL_UNKNOWN_CONTEXT_RESET_ARB); |
| 1054 command_buffer_->SetParseError(gpu::error::kLostContext); | 1056 command_buffer_->SetParseError(gpu::error::kLostContext); |
| 1055 } | 1057 } |
| 1056 | 1058 |
| 1057 uint64 GpuCommandBufferStub::GetMemoryUsage() const { | 1059 uint64 GpuCommandBufferStub::GetMemoryUsage() const { |
| 1058 return GetMemoryManager()->GetClientMemoryUsage(this); | 1060 return GetMemoryManager()->GetClientMemoryUsage(this); |
| 1059 } | 1061 } |
| 1060 | 1062 |
| 1061 } // namespace content | 1063 } // namespace content |
| OLD | NEW |