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

Side by Side Diff: ui/gfx/gpu_memory_buffer.cc

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix Android build Created 4 years, 3 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/gfx/gpu_memory_buffer.h ('k') | ui/gfx/gpu_memory_buffer_tracing.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/gfx/gpu_memory_buffer.h" 5 #include "ui/gfx/gpu_memory_buffer.h"
6 6
7 #include "ui/gfx/gpu_memory_buffer_tracing.h"
8
7 namespace gfx { 9 namespace gfx {
8 10
9 base::trace_event::MemoryAllocatorDumpGuid GetGpuMemoryBufferGUIDForTracing( 11 base::trace_event::MemoryAllocatorDumpGuid GetGpuMemoryBufferGUIDForTracing(
10 uint64_t tracing_process_id, 12 uint64_t tracing_process_id,
11 GpuMemoryBufferId buffer_id) { 13 GpuMemoryBufferId buffer_id) {
12 // TODO(ericrk): Currently this function just wraps 14 // TODO(ericrk): Currently this function just wraps
13 // GetGenericSharedMemoryGUIDForTracing, we may want to special case this if 15 // GetGenericSharedMemoryGUIDForTracing, we may want to special case this if
14 // the GPU memory buffer is not backed by shared memory. 16 // the GPU memory buffer is not backed by shared memory.
15 return gfx::GetGenericSharedMemoryGUIDForTracing(tracing_process_id, 17 return gfx::GetGenericSharedMemoryGUIDForTracing(tracing_process_id,
16 buffer_id); 18 buffer_id);
erikchen 2016/09/20 20:33:26 Why is the implementation here instead of gmb_trac
ccameron 2016/09/22 00:07:21 Mmh, might as well be in a _tracing.cc. Moved.
17 } 19 }
18 20
19 GpuMemoryBufferHandle::GpuMemoryBufferHandle() 21 GpuMemoryBufferHandle::GpuMemoryBufferHandle()
20 : type(EMPTY_BUFFER), id(0), handle(base::SharedMemory::NULLHandle()) { 22 : type(EMPTY_BUFFER), id(0), handle(base::SharedMemory::NULLHandle()) {
21 } 23 }
22 24
23 GpuMemoryBufferHandle::GpuMemoryBufferHandle( 25 GpuMemoryBufferHandle::GpuMemoryBufferHandle(
24 const GpuMemoryBufferHandle& other) = default; 26 const GpuMemoryBufferHandle& other) = default;
25 27
26 GpuMemoryBufferHandle::~GpuMemoryBufferHandle() {} 28 GpuMemoryBufferHandle::~GpuMemoryBufferHandle() {}
27 29
28 void GpuMemoryBuffer::SetColorSpaceForScanout( 30 void GpuMemoryBuffer::SetColorSpaceForScanout(
29 const gfx::ColorSpace& color_space) {} 31 const gfx::ColorSpace& color_space) {}
30 32
31 } // namespace gfx 33 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/gpu_memory_buffer.h ('k') | ui/gfx/gpu_memory_buffer_tracing.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698