Reject CompositorFrames with no render passes when deserializing

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 29bb3ee4c4d2ff0292d17f64798fa758797d4a9d..8f5bcd45e2ea309d55c521e61f803c83eed362f1 100644
--- a/content/renderer/android/synchronous_compositor_proxy.cc
+++ b/content/renderer/android/synchronous_compositor_proxy.cc
@@ -292,7 +292,7 @@ void SynchronousCompositorProxy::DemandDrawSw(
   }
   if (inside_receive_) {
     // Did not swap.
-    SendDemandDrawSwReply(false, cc::CompositorFrame(), reply_message);
+    SendDemandDrawSwReply(base::nullopt, reply_message);
     inside_receive_ = false;
   }
 }
@@ -323,18 +323,17 @@ void SynchronousCompositorProxy::SubmitCompositorFrameSw(
     cc::CompositorFrame frame) {
   DCHECK(inside_receive_);
   DCHECK(software_draw_reply_);
-  SendDemandDrawSwReply(true, std::move(frame), software_draw_reply_);
+  SendDemandDrawSwReply(std::move(frame.metadata), software_draw_reply_);
   inside_receive_ = false;
 }
 
 void SynchronousCompositorProxy::SendDemandDrawSwReply(
-    bool success,
-    cc::CompositorFrame frame,
+    base::Optional<cc::CompositorFrameMetadata> metadata,
     IPC::Message* reply_message) {
   SyncCompositorCommonRendererParams common_renderer_params;
   PopulateCommonParams(&common_renderer_params);
   SyncCompositorMsg_DemandDrawSw::WriteReplyParams(
-      reply_message, success, common_renderer_params, frame);
+      reply_message, common_renderer_params, metadata);
   Send(reply_message);
 }