| Index: content/renderer/pepper/pepper_graphics_2d_host.cc
|
| diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc
|
| index 6cce27eea06ae231b091cb3597adcd7967420e28..d8c829b9f8be36481586d43d829a442ba6730e5a 100644
|
| --- a/content/renderer/pepper/pepper_graphics_2d_host.cc
|
| +++ b/content/renderer/pepper/pepper_graphics_2d_host.cc
|
| @@ -228,8 +228,8 @@ int32_t PepperGraphics2DHost::OnResourceMessageReceived(
|
| OnHostMsgScroll)
|
| PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Graphics2D_ReplaceContents,
|
| OnHostMsgReplaceContents)
|
| - PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_Graphics2D_Flush,
|
| - OnHostMsgFlush)
|
| + PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Graphics2D_Flush,
|
| + OnHostMsgFlush)
|
| PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Graphics2D_SetScale,
|
| OnHostMsgSetScale)
|
| PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Graphics2D_ReadImageData,
|
| @@ -500,11 +500,15 @@ int32_t PepperGraphics2DHost::OnHostMsgReplaceContents(
|
| }
|
|
|
| int32_t PepperGraphics2DHost::OnHostMsgFlush(
|
| - ppapi::host::HostMessageContext* context) {
|
| + ppapi::host::HostMessageContext* context,
|
| + const std::vector<ui::LatencyInfo>& latency_info) {
|
| // Don't allow more than one pending flush at a time.
|
| if (HasPendingFlush())
|
| return PP_ERROR_INPROGRESS;
|
|
|
| + if (bound_instance_)
|
| + bound_instance_->AddLatencyInfo(latency_info);
|
| +
|
| PP_Resource old_image_data = 0;
|
| flush_reply_context_ = context->MakeReplyMessageContext();
|
| if (is_running_in_process_)
|
|
|