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

Unified Diff: trunk/src/content/renderer/child_frame_compositing_helper.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/renderer/child_frame_compositing_helper.cc
===================================================================
--- trunk/src/content/renderer/child_frame_compositing_helper.cc (revision 251280)
+++ trunk/src/content/renderer/child_frame_compositing_helper.cc (working copy)
@@ -246,10 +246,12 @@
ack_pending_ = false;
switch (mailbox.type) {
case TEXTURE_IMAGE_TRANSPORT: {
+ std::string mailbox_name(reinterpret_cast<const char*>(mailbox.name.name),
+ sizeof(mailbox.name.name));
FrameHostMsg_BuffersSwappedACK_Params params;
params.gpu_host_id = mailbox.host_id;
params.gpu_route_id = mailbox.route_id;
- params.mailbox = mailbox.name;
+ params.mailbox_name = mailbox_name;
params.sync_point = sync_point;
SendBuffersSwappedACKToBrowser(params);
break;
@@ -376,12 +378,12 @@
void ChildFrameCompositingHelper::OnBuffersSwapped(
const gfx::Size& size,
- const gpu::Mailbox& mailbox,
+ const std::string& mailbox_name,
int gpu_route_id,
int gpu_host_id,
float device_scale_factor) {
SwapBuffersInfo swap_info;
- swap_info.name = mailbox;
+ swap_info.name.SetName(reinterpret_cast<const int8*>(mailbox_name.data()));
swap_info.type = TEXTURE_IMAGE_TRANSPORT;
swap_info.size = size;
swap_info.route_id = gpu_route_id;
« no previous file with comments | « trunk/src/content/renderer/child_frame_compositing_helper.h ('k') | trunk/src/content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698