projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
common
/
gpu
/
client
/
gpu_memory_buffer_impl_win.cc
diff --git
a/src/content/common/gpu/client/gpu_memory_buffer_impl_win.cc
b/src/content/common/gpu/client/gpu_memory_buffer_impl_win.cc
index
592920c
..
3c144f3
100644
(file)
--- a/
src/content/common/gpu/client/gpu_memory_buffer_impl_win.cc
+++ b/
src/content/common/gpu/client/gpu_memory_buffer_impl_win.cc
@@
-9,15
+9,15
@@
namespace content {
// static
namespace content {
// static
-void GpuMemoryBufferImpl::Create(const gfx::Size& size,
- unsigned internalformat,
- unsigned usage,
+void GpuMemoryBufferImpl::Create(gfx::GpuMemoryBufferId id,
+ const gfx::Size& size,
+ Format format,
+ Usage usage,
int client_id,
const CreationCallback& callback) {
if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
int client_id,
const CreationCallback& callback) {
if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
- size, internalformat, usage)) {
- GpuMemoryBufferImplSharedMemory::Create(
- size, internalformat, usage, callback);
+ size, format, usage)) {
+ GpuMemoryBufferImplSharedMemory::Create(id, size, format, callback);
return;
}
return;
}
@@
-26,16
+26,17
@@
void GpuMemoryBufferImpl::Create(const gfx::Size& size,
// static
void GpuMemoryBufferImpl::AllocateForChildProcess(
// static
void GpuMemoryBufferImpl::AllocateForChildProcess(
+ gfx::GpuMemoryBufferId id,
const gfx::Size& size,
const gfx::Size& size,
-
unsigned internal
format,
-
unsigned
usage,
+
Format
format,
+
Usage
usage,
base::ProcessHandle child_process,
int child_client_id,
const AllocationCallback& callback) {
if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
base::ProcessHandle child_process,
int child_client_id,
const AllocationCallback& callback) {
if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
- size,
internal
format, usage)) {
+ size, format, usage)) {
GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
-
size, internal
format, child_process, callback);
+
id, size,
format, child_process, callback);
return;
}
return;
}
@@
-45,20
+46,22
@@
void GpuMemoryBufferImpl::AllocateForChildProcess(
// static
void GpuMemoryBufferImpl::DeletedByChildProcess(
gfx::GpuMemoryBufferType type,
// static
void GpuMemoryBufferImpl::DeletedByChildProcess(
gfx::GpuMemoryBufferType type,
- const gfx::GpuMemoryBufferId& id,
- base::ProcessHandle child_process) {
+ gfx::GpuMemoryBufferId id,
+ base::ProcessHandle child_process,
+ int child_client_id,
+ uint32 sync_point) {
}
// static
scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
const gfx::GpuMemoryBufferHandle& handle,
const gfx::Size& size,
}
// static
scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
const gfx::GpuMemoryBufferHandle& handle,
const gfx::Size& size,
-
unsigned internal
format,
+
Format
format,
const DestructionCallback& callback) {
switch (handle.type) {
case gfx::SHARED_MEMORY_BUFFER:
return GpuMemoryBufferImplSharedMemory::CreateFromHandle(
const DestructionCallback& callback) {
switch (handle.type) {
case gfx::SHARED_MEMORY_BUFFER:
return GpuMemoryBufferImplSharedMemory::CreateFromHandle(
- handle, size,
internal
format, callback);
+ handle, size, format, callback);
default:
return scoped_ptr<GpuMemoryBufferImpl>();
}
default:
return scoped_ptr<GpuMemoryBufferImpl>();
}