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

Side by Side Diff: content/browser/gpu/browser_gpu_memory_buffer_manager.cc

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again 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
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 "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 5 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "base/synchronization/waitable_event.h" 12 #include "base/synchronization/waitable_event.h"
13 #include "base/threading/thread_restrictions.h" 13 #include "base/threading/thread_restrictions.h"
14 #include "base/trace_event/process_memory_dump.h" 14 #include "base/trace_event/process_memory_dump.h"
15 #include "base/trace_event/trace_event.h" 15 #include "base/trace_event/trace_event.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "content/browser/gpu/gpu_process_host.h" 17 #include "content/browser/gpu/gpu_process_host.h"
18 #include "content/common/child_process_host_impl.h" 18 #include "content/common/child_process_host_impl.h"
19 #include "content/common/generic_shared_memory_id_generator.h" 19 #include "content/common/generic_shared_memory_id_generator.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/common/content_switches.h" 21 #include "content/public/common/content_switches.h"
22 #include "gpu/GLES2/gl2extchromium.h" 22 #include "gpu/GLES2/gl2extchromium.h"
23 #include "gpu/ipc/client/gpu_memory_buffer_impl.h" 23 #include "gpu/ipc/client/gpu_memory_buffer_impl.h"
24 #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h" 24 #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h"
25 #include "gpu/ipc/common/gpu_memory_buffer_support.h" 25 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
26 #include "ui/gfx/buffer_format_util.h" 26 #include "ui/gfx/buffer_format_util.h"
27 #include "ui/gfx/gpu_memory_buffer_tracing.h"
27 #include "ui/gl/gl_switches.h" 28 #include "ui/gl/gl_switches.h"
28 29
29 namespace content { 30 namespace content {
30 namespace { 31 namespace {
31 32
32 void HostCreateGpuMemoryBuffer( 33 void HostCreateGpuMemoryBuffer(
33 gpu::SurfaceHandle surface_handle, 34 gpu::SurfaceHandle surface_handle,
34 GpuProcessHost* host, 35 GpuProcessHost* host,
35 gfx::GpuMemoryBufferId id, 36 gfx::GpuMemoryBufferId id,
36 const gfx::Size& size, 37 const gfx::Size& size,
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 format(format), 681 format(format),
681 usage(usage), 682 usage(usage),
682 gpu_host_id(gpu_host_id) {} 683 gpu_host_id(gpu_host_id) {}
683 684
684 BrowserGpuMemoryBufferManager::BufferInfo::BufferInfo(const BufferInfo& other) = 685 BrowserGpuMemoryBufferManager::BufferInfo::BufferInfo(const BufferInfo& other) =
685 default; 686 default;
686 687
687 BrowserGpuMemoryBufferManager::BufferInfo::~BufferInfo() {} 688 BrowserGpuMemoryBufferManager::BufferInfo::~BufferInfo() {}
688 689
689 } // namespace content 690 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/compositor/surface_utils.cc ('k') | content/renderer/media/canvas_capture_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698