content/browser/gpu/gpu_process_host.cc - Issue 11194042: Implement TextureImageTransportSurface using texture mailbox

Unified Diff: content/browser/gpu/gpu_process_host.cc

Issue 11194042: Implement TextureImageTransportSurface using texture mailbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win_aura DCHECK() Created 8 years 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/browser/gpu/gpu_process_host.cc

diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc

index 633f6d31d68b17ff4b86aae9ab2d476b533e6c45..ac85420a3e719e3a45672897620b7f476b986dc3 100644

--- a/content/browser/gpu/gpu_process_host.cc

+++ b/content/browser/gpu/gpu_process_host.cc

@@ -100,7 +100,7 @@ void SendGpuProcessMessage(GpuProcessHost::GpuProcessKind kind,

void AcceleratedSurfaceBuffersSwappedCompletedForGPU(int host_id,

int route_id,

bool alive,

- bool did_swap) {

+ uint64 surface_handle) {

if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {

BrowserThread::PostTask(

BrowserThread::IO,

@@ -109,7 +109,7 @@ void AcceleratedSurfaceBuffersSwappedCompletedForGPU(int host_id,

host_id,

route_id,

alive,

- did_swap));

+ surface_handle));

return;

}

@@ -117,7 +117,7 @@ void AcceleratedSurfaceBuffersSwappedCompletedForGPU(int host_id,

if (host) {

if (alive)

host->Send(new AcceleratedSurfaceMsg_BufferPresented(

- route_id, did_swap, 0));

+ route_id, surface_handle, 0));

else

host->ForceShutdown();

}

@@ -159,11 +159,12 @@ void AcceleratedSurfaceBuffersSwappedCompletedForRenderer(

void AcceleratedSurfaceBuffersSwappedCompleted(int host_id,

int route_id,

int surface_id,

+ uint64 surface_handle,

bool alive,

base::TimeTicks timebase,

base::TimeDelta interval) {

AcceleratedSurfaceBuffersSwappedCompletedForGPU(host_id, route_id,

- alive, true /* presented */);

+ alive, surface_handle);

AcceleratedSurfaceBuffersSwappedCompletedForRenderer(surface_id, timebase,

interval);

}

@@ -762,7 +763,7 @@ void GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped(

base::ScopedClosureRunner scoped_completion_runner(

base::Bind(&AcceleratedSurfaceBuffersSwappedCompletedForGPU,

host_id_, params.route_id,

- true /* alive */, false /* presented */));

+ true /* alive */, params.surface_handle));

int render_process_id = 0;

int render_widget_id = 0;

@@ -797,8 +798,8 @@ void GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped(

base::ScopedClosureRunner scoped_completion_runner(

base::Bind(&AcceleratedSurfaceBuffersSwappedCompleted,

- host_id_, params.route_id, params.surface_id,

- true, base::TimeTicks(), base::TimeDelta()));

+ host_id_, params.route_id, params.surface_id, params.surface_handle,

+ true, base::TimeTicks(), base::TimeDelta()));

gfx::PluginWindowHandle handle =

GpuSurfaceTracker::Get()->GetSurfaceWindowHandle(params.surface_id);

@@ -830,7 +831,8 @@ void GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped(

base::Bind(&AcceleratedSurfaceBuffersSwappedCompleted,

host_id_,

params.route_id,

- params.surface_id));

+ params.surface_id,

+ params.surface_handle));

}

void GpuProcessHost::OnAcceleratedSurfacePostSubBuffer(

« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.cc ('k') | content/browser/gpu/gpu_process_host_ui_shim.cc » ('j') | no next file with comments »