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

Unified Diff: trunk/src/content/browser/gpu/gpu_process_host_ui_shim.cc

Issue 163433008: Revert 251207 "Use gpu::Mailbox instead of std:string in IPCs" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 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: trunk/src/content/browser/gpu/gpu_process_host_ui_shim.cc
===================================================================
--- trunk/src/content/browser/gpu/gpu_process_host_ui_shim.cc (revision 251280)
+++ trunk/src/content/browser/gpu/gpu_process_host_ui_shim.cc (working copy)
@@ -288,7 +288,7 @@
"GpuHostMsg_AcceleratedSurfaceBuffersSwapped"))
return;
AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
- ack_params.mailbox = params.mailbox;
+ ack_params.mailbox_name = params.mailbox_name;
ack_params.sync_point = 0;
ScopedSendOnIOThread delayed_send(
host_id_,
@@ -295,6 +295,10 @@
new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
ack_params));
+ if (!params.mailbox_name.empty() &&
+ params.mailbox_name.length() != GL_MAILBOX_SIZE_CHROMIUM)
+ return;
+
RenderWidgetHostViewPort* view = GetRenderWidgetHostViewFromSurfaceID(
params.surface_id);
if (!view)
@@ -334,7 +338,7 @@
"GpuHostMsg_AcceleratedSurfacePostSubBuffer"))
return;
AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
- ack_params.mailbox = params.mailbox;
+ ack_params.mailbox_name = params.mailbox_name;
ack_params.sync_point = 0;
ScopedSendOnIOThread delayed_send(
host_id_,
@@ -341,6 +345,10 @@
new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
ack_params));
+ if (!params.mailbox_name.empty() &&
+ params.mailbox_name.length() != GL_MAILBOX_SIZE_CHROMIUM)
+ return;
+
RenderWidgetHostViewPort* view =
GetRenderWidgetHostViewFromSurfaceID(params.surface_id);
if (!view)

Powered by Google App Engine
This is Rietveld 408576698