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

Side by Side Diff: ui/gl/gl_image_shared_memory.cc

Issue 301793003: During image destroy, delete textures only if we have a GL context. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve android clang dbg build issue. Created 6 years, 4 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
« no previous file with comments | « ui/gl/gl_image_shared_memory.h ('k') | ui/gl/gl_image_stub.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/gl/gl_image_shared_memory.h" 5 #include "ui/gl/gl_image_shared_memory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/process/process_handle.h" 8 #include "base/process/process_handle.h"
9 9
10 namespace gfx { 10 namespace gfx {
11 11
12 GLImageSharedMemory::GLImageSharedMemory(const gfx::Size& size, 12 GLImageSharedMemory::GLImageSharedMemory(const gfx::Size& size,
13 unsigned internalformat) 13 unsigned internalformat)
14 : GLImageMemory(size, internalformat) { 14 : GLImageMemory(size, internalformat) {
15 } 15 }
16 16
17 GLImageSharedMemory::~GLImageSharedMemory() { 17 GLImageSharedMemory::~GLImageSharedMemory() {
18 Destroy(); 18 DCHECK(!shared_memory_);
19 } 19 }
20 20
21 bool GLImageSharedMemory::Initialize(const gfx::GpuMemoryBufferHandle& handle) { 21 bool GLImageSharedMemory::Initialize(const gfx::GpuMemoryBufferHandle& handle) {
22 if (!HasValidFormat()) 22 if (!HasValidFormat())
23 return false; 23 return false;
24 24
25 if (!base::SharedMemory::IsHandleValid(handle.handle)) 25 if (!base::SharedMemory::IsHandleValid(handle.handle))
26 return false; 26 return false;
27 27
28 base::SharedMemory shared_memory(handle.handle, true); 28 base::SharedMemory shared_memory(handle.handle, true);
(...skipping 14 matching lines...) Expand all
43 return false; 43 return false;
44 } 44 }
45 45
46 DCHECK(!shared_memory_); 46 DCHECK(!shared_memory_);
47 shared_memory_ = duped_shared_memory.Pass(); 47 shared_memory_ = duped_shared_memory.Pass();
48 GLImageMemory::Initialize( 48 GLImageMemory::Initialize(
49 static_cast<unsigned char*>(shared_memory_->memory())); 49 static_cast<unsigned char*>(shared_memory_->memory()));
50 return true; 50 return true;
51 } 51 }
52 52
53 void GLImageSharedMemory::Destroy() { 53 void GLImageSharedMemory::Destroy(bool have_context) {
54 GLImageMemory::Destroy(); 54 GLImageMemory::Destroy(have_context);
55 shared_memory_.reset(); 55 shared_memory_.reset();
56 } 56 }
57 57
58 } // namespace gfx 58 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_image_shared_memory.h ('k') | ui/gl/gl_image_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698