aw: Refactor to move FrameFuture into ChildFrame

android_webview/browser/hardware_renderer.cc

Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index 391534203dfd68d4ba41527c3b4c8bc62fe09f48..57158635036f0dbf3ba0e23bfb0d617bbc831220 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -62,30 +62,14 @@ void HardwareRenderer::CommitFrame() {
   if (!child_frame.get())
     return;
   ReturnResourcesInChildFrame();
-  frame_future_ = render_thread_manager_->PassFrameFutureOnRT();
   child_frame_ = std::move(child_frame);
 }
 
 void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info) {
   TRACE_EVENT0("android_webview", "HardwareRenderer::DrawGL");
 
-  if (frame_future_) {
-    TRACE_EVENT0("android_webview", "GetFrame");
-    DCHECK(child_frame_);
-    DCHECK(!child_frame_->frame);
-
-    std::unique_ptr<content::SynchronousCompositor::Frame> frame =
-        frame_future_->GetFrame();
-    if (frame) {
-      child_frame_->compositor_frame_sink_id = frame->compositor_frame_sink_id;
-      child_frame_->frame = std::move(frame->frame);
-    } else {
-      child_frame_.reset();
-    }
-    frame_future_ = nullptr;
-  }
-
   if (child_frame_) {
+    child_frame_->WaitOnFutureIfNeeded();
     last_committed_compositor_frame_sink_id_ =
         child_frame_->compositor_frame_sink_id;
   }