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

Side by Side Diff: gpu/command_buffer/client/mapped_memory.cc

Issue 881973004: Mechanical rename of tracing includes for /gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix .mm file Created 5 years, 10 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 | « no previous file | gpu/command_buffer/client/transfer_buffer.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "gpu/command_buffer/client/mapped_memory.h" 5 #include "gpu/command_buffer/client/mapped_memory.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/debug/trace_event.h"
11 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/trace_event/trace_event.h"
12 #include "gpu/command_buffer/client/cmd_buffer_helper.h" 12 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
13 13
14 namespace gpu { 14 namespace gpu {
15 15
16 MemoryChunk::MemoryChunk(int32 shm_id, 16 MemoryChunk::MemoryChunk(int32 shm_id,
17 scoped_refptr<gpu::Buffer> shm, 17 scoped_refptr<gpu::Buffer> shm,
18 CommandBufferHelper* helper, 18 CommandBufferHelper* helper,
19 const base::Closure& poll_callback) 19 const base::Closure& poll_callback)
20 : shm_id_(shm_id), 20 : shm_id_(shm_id),
21 shm_(shm), 21 shm_(shm),
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 cmd_buf->DestroyTransferBuffer(chunk->shm_id()); 134 cmd_buf->DestroyTransferBuffer(chunk->shm_id());
135 allocated_memory_ -= chunk->GetSize(); 135 allocated_memory_ -= chunk->GetSize();
136 iter = chunks_.erase(iter); 136 iter = chunks_.erase(iter);
137 } else { 137 } else {
138 ++iter; 138 ++iter;
139 } 139 }
140 } 140 }
141 } 141 }
142 142
143 } // namespace gpu 143 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/client/transfer_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698