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

content/renderer/android/synchronous_compositor_proxy.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
+#include "base/optional.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/renderer/android/synchronous_compositor_frame_sink.h"
 #include "ui/events/blink/synchronous_input_handler_proxy.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/geometry/size_f.h"
 
 class SkCanvas;
 
 namespace IPC {
 class Message;
@@ skipping 64 matching lines @@
   void SynchronouslyZoomBy(
       float zoom_delta,
       const gfx::Point& anchor,
       SyncCompositorCommonRendererParams* common_renderer_params);
   void SetScroll(const gfx::ScrollOffset& total_scroll_offset);
 
   void SubmitCompositorFrameHwAsync(uint32_t compositor_frame_sink_id,
                                     cc::CompositorFrame frame);
   void SubmitCompositorFrameHw(uint32_t compositor_frame_sink_id,
                                cc::CompositorFrame frame);
-  void SendDemandDrawHwReply(cc::CompositorFrame frame,
+  void SendDemandDrawHwReply(base::Optional<cc::CompositorFrame> frame,
                              uint32_t compositor_frame_sink_id,
                              IPC::Message* reply_message);
-  void SendDemandDrawHwReplyAsync(cc::CompositorFrame frame,
+  void SendDemandDrawHwReplyAsync(base::Optional<cc::CompositorFrame> frame,
                                   uint32_t compositor_frame_sink_id);
   void DoDemandDrawSw(const SyncCompositorDemandDrawSwParams& params);
   void SubmitCompositorFrameSw(cc::CompositorFrame frame);
   void SendDemandDrawSwReply(bool success,
                              cc::CompositorFrame frame,
                              IPC::Message* reply_message);
   void SendAsyncRendererStateIfNeeded();
   void DoDemandDrawHw(const SyncCompositorDemandDrawHwParams& params,
                       IPC::Message* reply_message);
 
@@ skipping 21 matching lines @@
   bool need_animate_scroll_;
   uint32_t need_invalidate_count_;
   uint32_t did_activate_pending_tree_count_;
 
   DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_