Switching to base::Optional<CompositorFrame> in Android's synchronous compositor IPC messages

content/renderer/android/synchronous_compositor_proxy.cc

Index: content/renderer/android/synchronous_compositor_proxy.cc
diff --git a/content/renderer/android/synchronous_compositor_proxy.cc b/content/renderer/android/synchronous_compositor_proxy.cc
index fde29a64d26f869494af4d179e51faac6fe63d26..91ee744487af09a7e00a01d8acc67ee96de4e364 100644
--- a/content/renderer/android/synchronous_compositor_proxy.cc
+++ b/content/renderer/android/synchronous_compositor_proxy.cc
@@ -188,9 +188,9 @@ void SynchronousCompositorProxy::DoDemandDrawHw(
   if (inside_receive_) {
     // Did not swap.
     if (!reply_message) {
-      SendDemandDrawHwReplyAsync(cc::CompositorFrame(), 0u);
+      SendDemandDrawHwReplyAsync(cc::CompositorFrame(), 0u, false);
     } else {
-      SendDemandDrawHwReply(cc::CompositorFrame(), 0u, reply_message);
+      SendDemandDrawHwReply(cc::CompositorFrame(), 0u, false, reply_message);
     }
     inside_receive_ = false;
   }
@@ -201,7 +201,7 @@ void SynchronousCompositorProxy::SubmitCompositorFrameHwAsync(
     cc::CompositorFrame frame) {
   DCHECK(inside_receive_);
   DCHECK(hardware_draw_reply_async_);
-  SendDemandDrawHwReplyAsync(std::move(frame), compositor_frame_sink_id);
+  SendDemandDrawHwReplyAsync(std::move(frame), compositor_frame_sink_id, true);
   inside_receive_ = false;
 }
 
@@ -210,26 +210,29 @@ void SynchronousCompositorProxy::SubmitCompositorFrameHw(
     cc::CompositorFrame frame) {
   DCHECK(inside_receive_);
   DCHECK(hardware_draw_reply_);
-  SendDemandDrawHwReply(std::move(frame), compositor_frame_sink_id,
+  SendDemandDrawHwReply(std::move(frame), compositor_frame_sink_id, true,
                         hardware_draw_reply_);
   inside_receive_ = false;
 }
 
 void SynchronousCompositorProxy::SendDemandDrawHwReplyAsync(
     cc::CompositorFrame frame,
-    uint32_t compositor_frame_sink_id) {
-  Send(new SyncCompositorHostMsg_ReturnFrame(routing_id_,
-                                             compositor_frame_sink_id, frame));
+    uint32_t compositor_frame_sink_id,
+    bool has_swapped) {
+  Send(new SyncCompositorHostMsg_ReturnFrame(
+      routing_id_, compositor_frame_sink_id, frame, has_swapped));
 }
 
 void SynchronousCompositorProxy::SendDemandDrawHwReply(
     cc::CompositorFrame frame,
     uint32_t compositor_frame_sink_id,
+    bool has_swapped,
     IPC::Message* reply_message) {
   SyncCompositorCommonRendererParams common_renderer_params;
   PopulateCommonParams(&common_renderer_params);
   SyncCompositorMsg_DemandDrawHw::WriteReplyParams(
-      reply_message, common_renderer_params, compositor_frame_sink_id, frame);
+      reply_message, common_renderer_params, compositor_frame_sink_id, frame,
+      has_swapped);
   Send(reply_message);
 }