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

Unified Diff: content/browser/gpu/gpu_process_host_ui_shim.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
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/renderer_host/image_transport_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_process_host_ui_shim.cc
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
index 4a991e0af92c147bc32184c5c592fe9865899c84..d1f35dd2f9b313300793666b0e188c1e37cfdfcd 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.cc
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -31,6 +31,11 @@
#include <gdk/gdkx.h> // NOLINT
#endif
+// From gl2/gl2ext.h.
+#ifndef GL_MAILBOX_SIZE_CHROMIUM
+#define GL_MAILBOX_SIZE_CHROMIUM 64
+#endif
+
namespace content {
namespace {
@@ -302,8 +307,14 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceNew(
params.surface_id);
if (!view)
return;
+
+ if (params.mailbox_name.length() &&
+ params.mailbox_name.length() != GL_MAILBOX_SIZE_CHROMIUM)
+ return;
+
view->AcceleratedSurfaceNew(
- params.width, params.height, params.surface_handle);
+ params.width, params.height, params.surface_handle,
+ params.mailbox_name);
}
static base::TimeDelta GetSwapDelay() {
@@ -323,7 +334,9 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
ScopedSendOnIOThread delayed_send(
host_id_,
- new AcceleratedSurfaceMsg_BufferPresented(params.route_id, false, 0));
+ new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
+ params.surface_handle,
+ 0));
RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
params.surface_id);
@@ -347,7 +360,9 @@ void GpuProcessHostUIShim::OnAcceleratedSurfacePostSubBuffer(
ScopedSendOnIOThread delayed_send(
host_id_,
- new AcceleratedSurfaceMsg_BufferPresented(params.route_id, false, 0));
+ new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
+ params.surface_handle,
+ 0));
RenderWidgetHostViewPort* view =
GetRenderWidgetHostViewFromSurfaceID(params.surface_id);
@@ -378,7 +393,7 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceRelease(
params.surface_id);
if (!view)
return;
- view->AcceleratedSurfaceRelease(params.identifier);
+ view->AcceleratedSurfaceRelease();
}
void GpuProcessHostUIShim::OnVideoMemoryUsageStatsReceived(
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/renderer_host/image_transport_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698