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

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: address comments Created 8 years, 1 month 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_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 93aa1e5c96158568b249c44c7ca0f7f74a8bb773..5fc026373f066599e308ba6229f18179b0af4a08 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);

Powered by Google App Engine
This is Rietveld 408576698