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

Unified Diff: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

Issue 302603004: Plumb GpuMemoryBuffer allocation to GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
index f6080506caadab0bfbdbb6aba88c7ee5a1289ec9..3e24efb05454682ddb14f298f213e0959468f739 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
@@ -70,8 +70,7 @@ bool GpuMemoryBufferImplSurfaceTexture::InitializeFromHandle(
DCHECK(IsFormatSupported(internalformat_));
DCHECK(!native_window_);
native_window_ = SurfaceTextureLookup::GetInstance()->AcquireNativeWidget(
- handle.surface_texture_id.primary_id,
- handle.surface_texture_id.secondary_id);
+ handle.gpu_memory_id.primary_id, handle.gpu_memory_id.secondary_id);
if (!native_window_)
return false;
@@ -80,7 +79,7 @@ bool GpuMemoryBufferImplSurfaceTexture::InitializeFromHandle(
size_.height(),
WindowFormat(internalformat_));
- surface_texture_id_ = handle.surface_texture_id;
+ gpu_memory_id_ = handle.gpu_memory_id;
return true;
}
@@ -116,7 +115,7 @@ gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()
const {
gfx::GpuMemoryBufferHandle handle;
handle.type = gfx::SURFACE_TEXTURE_BUFFER;
- handle.surface_texture_id = surface_texture_id_;
+ handle.gpu_memory_id = gpu_memory_id_;
return handle;
}

Powered by Google App Engine
This is Rietveld 408576698