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

Unified Diff: content/common/child_process_host_impl.cc

Issue 1263913002: FREEZE.unindexed Base URL: https://chromium.googlesource.com/chromium/src.git@textures3
Patch Set: Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/child_process_host_impl.h ('k') | content/common/child_process_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/child_process_host_impl.cc
diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc
index 67004c1668475161fe2057b72cbffc5d053c027c..3aad503d6c424ca50db5096ffe8a2fad90ae7ec4 100644
--- a/content/common/child_process_host_impl.cc
+++ b/content/common/child_process_host_impl.cc
@@ -87,9 +87,6 @@ base::FilePath TransformPathForFeature(const base::FilePath& path,
// Global atomic to generate child process unique IDs.
base::StaticAtomicSequenceNumber g_unique_id;
-// Global atomic to generate gpu memory buffer unique IDs.
-base::StaticAtomicSequenceNumber g_next_gpu_memory_buffer_id;
-
} // namespace
namespace content {
@@ -358,6 +355,7 @@ void ChildProcessHostImpl::OnShutdownRequest() {
}
void ChildProcessHostImpl::OnAllocateGpuMemoryBuffer(
+ gfx::GpuMemoryBufferId id,
uint32 width,
uint32 height,
gfx::BufferFormat format,
@@ -371,8 +369,7 @@ void ChildProcessHostImpl::OnAllocateGpuMemoryBuffer(
if (GpuMemoryBufferImplSharedMemory::IsFormatSupported(format) &&
GpuMemoryBufferImplSharedMemory::IsUsageSupported(usage)) {
*handle = GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
- g_next_gpu_memory_buffer_id.GetNext(), gfx::Size(width, height), format,
- peer_process_.Handle());
+ id, gfx::Size(width, height), format, peer_process_.Handle());
}
}
« no previous file with comments | « content/common/child_process_host_impl.h ('k') | content/common/child_process_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698