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

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

Issue 634083002: gpu: Compositor management of GpuMemoryBuffer instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cc-pre-chromium-image-refactor
Patch Set: mac build fix Created 6 years, 2 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
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 DCHECK(!shared_memory_); 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 gfx::GpuMemoryBuffer::Format format) {
23 return false;
24
25 if (!base::SharedMemory::IsHandleValid(handle.handle)) 23 if (!base::SharedMemory::IsHandleValid(handle.handle))
26 return false; 24 return false;
27 25
28 base::SharedMemory shared_memory(handle.handle, true); 26 base::SharedMemory shared_memory(handle.handle, true);
29 27
30 // Duplicate the handle. 28 // Duplicate the handle.
31 base::SharedMemoryHandle duped_shared_memory_handle; 29 base::SharedMemoryHandle duped_shared_memory_handle;
32 if (!shared_memory.ShareToProcess(base::GetCurrentProcessHandle(), 30 if (!shared_memory.ShareToProcess(base::GetCurrentProcessHandle(),
33 &duped_shared_memory_handle)) { 31 &duped_shared_memory_handle)) {
34 DVLOG(0) << "Failed to duplicate shared memory handle."; 32 DVLOG(0) << "Failed to duplicate shared memory handle.";
35 return false; 33 return false;
36 } 34 }
37 35
38 scoped_ptr<base::SharedMemory> duped_shared_memory( 36 scoped_ptr<base::SharedMemory> duped_shared_memory(
39 new base::SharedMemory(duped_shared_memory_handle, true)); 37 new base::SharedMemory(duped_shared_memory_handle, true));
38 if (!duped_shared_memory->Map(GetSize().GetArea() * BytesPerPixel(format))) {
piman 2014/10/09 21:33:02 We should avoid GetSize().GetArea() * BytesPerPixe
reveman 2014/10/10 02:20:16 Done.
39 DVLOG(0) << "Failed to map shared memory.";
40 return false;
41 }
40 42
41 if (!duped_shared_memory->Map(Bytes())) { 43 if (!GLImageMemory::Initialize(
42 DVLOG(0) << "Failed to map shared memory."; 44 static_cast<unsigned char*>(duped_shared_memory->memory()), format)) {
43 return false; 45 return false;
44 } 46 }
45 47
46 DCHECK(!shared_memory_); 48 DCHECK(!shared_memory_);
47 shared_memory_ = duped_shared_memory.Pass(); 49 shared_memory_ = duped_shared_memory.Pass();
48 GLImageMemory::Initialize(
49 static_cast<unsigned char*>(shared_memory_->memory()));
50 return true; 50 return true;
51 } 51 }
52 52
53 void GLImageSharedMemory::Destroy(bool have_context) { 53 void GLImageSharedMemory::Destroy(bool have_context) {
54 GLImageMemory::Destroy(have_context); 54 GLImageMemory::Destroy(have_context);
55 shared_memory_.reset(); 55 shared_memory_.reset();
56 } 56 }
57 57
58 } // namespace gfx 58 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698