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

Side by Side Diff: cc/raster/staging_buffer_pool.h

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
« no previous file with comments | « cc/raster/one_copy_raster_buffer_provider.cc ('k') | cc/raster/staging_buffer_pool.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CC_RASTER_STAGING_BUFFER_POOL_H_ 5 #ifndef CC_RASTER_STAGING_BUFFER_POOL_H_
6 #define CC_RASTER_STAGING_BUFFER_POOL_H_ 6 #define CC_RASTER_STAGING_BUFFER_POOL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <deque> 10 #include <deque>
11 #include <memory> 11 #include <memory>
12 #include <set> 12 #include <set>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/memory_coordinator_client.h" 15 #include "base/memory/memory_coordinator_client.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/synchronization/lock.h" 17 #include "base/synchronization/lock.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "base/trace_event/memory_dump_provider.h" 19 #include "base/trace_event/memory_dump_provider.h"
20 #include "base/trace_event/trace_event.h"
20 #include "cc/output/context_provider.h" 21 #include "cc/output/context_provider.h"
21 #include "cc/resources/resource_provider.h" 22 #include "cc/resources/resource_provider.h"
22 23
23 namespace gpu { 24 namespace gpu {
24 namespace gles2 { 25 namespace gles2 {
25 class GLES2Interface; 26 class GLES2Interface;
26 } 27 }
27 } 28 }
28 29
29 namespace cc { 30 namespace cc {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 base::Closure reduce_memory_usage_callback_; 113 base::Closure reduce_memory_usage_callback_;
113 114
114 base::WeakPtrFactory<StagingBufferPool> weak_ptr_factory_; 115 base::WeakPtrFactory<StagingBufferPool> weak_ptr_factory_;
115 116
116 DISALLOW_COPY_AND_ASSIGN(StagingBufferPool); 117 DISALLOW_COPY_AND_ASSIGN(StagingBufferPool);
117 }; 118 };
118 119
119 } // namespace cc 120 } // namespace cc
120 121
121 #endif // CC_RASTER_STAGING_BUFFER_POOL_H_ 122 #endif // CC_RASTER_STAGING_BUFFER_POOL_H_
OLDNEW
« no previous file with comments | « cc/raster/one_copy_raster_buffer_provider.cc ('k') | cc/raster/staging_buffer_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698