Make SurfaceFactory lifetime match frame_sink_id_ registration in Android WebView

android_webview/browser/hardware_renderer.cc

 // Copyright 2014 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.
 
 #include "android_webview/browser/hardware_renderer.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/aw_render_thread_context_provider.h"
@@ skipping 12 matching lines @@
 #include "ui/gl/gl_bindings.h"
 
 namespace android_webview {
 
 HardwareRenderer::HardwareRenderer(RenderThreadManager* state)
     : render_thread_manager_(state),
       last_egl_context_(eglGetCurrentContext()),
       surfaces_(SurfacesInstance::GetOrCreateInstance()),
       frame_sink_id_(surfaces_->AllocateFrameSinkId()),
       surface_id_allocator_(base::MakeUnique<cc::SurfaceIdAllocator>()),
+      surface_factory_(new cc::SurfaceFactory(frame_sink_id_,
+                                              surfaces_->GetSurfaceManager(),
+                                              this)),
       last_committed_compositor_frame_sink_id_(0u),
       last_submitted_compositor_frame_sink_id_(0u) {
   DCHECK(last_egl_context_);
   surfaces_->GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
   surfaces_->GetSurfaceManager()->RegisterSurfaceFactoryClient(frame_sink_id_,
                                                                this);
 }
 
 HardwareRenderer::~HardwareRenderer() {
   // Must reset everything before |surface_factory_| to ensure all
@@ skipping 45 matching lines @@
   // kModeProcess. Instead, submit the frame in "kModeDraw" stage to avoid
   // unnecessary kModeProcess.
   if (child_frame_.get() && child_frame_->frame.get()) {
     if (!compositor_id_.Equals(child_frame_->compositor_id) ||
         last_submitted_compositor_frame_sink_id_ !=
             child_frame_->compositor_frame_sink_id) {
       if (!child_id_.is_null())
         DestroySurface();
 
       // This will return all the resources to the previous compositor.
-      surface_factory_.reset();
+      surface_factory_->Reset();
       compositor_id_ = child_frame_->compositor_id;
       last_submitted_compositor_frame_sink_id_ =
           child_frame_->compositor_frame_sink_id;
-      surface_factory_.reset(new cc::SurfaceFactory(
-          frame_sink_id_, surfaces_->GetSurfaceManager(), this));
     }
 
     std::unique_ptr<cc::CompositorFrame> child_compositor_frame =
         std::move(child_frame_->frame);
 
     gfx::Size frame_size =
         child_compositor_frame->render_pass_list.back()->output_rect.size();
     bool size_changed = frame_size != frame_size_;
     frame_size_ = frame_size;
     if (child_id_.is_null() || size_changed) {
@@ skipping 27 matching lines @@
 
   gfx::Rect clip(draw_info->clip_left, draw_info->clip_top,
                  draw_info->clip_right - draw_info->clip_left,
                  draw_info->clip_bottom - draw_info->clip_top);
   surfaces_->DrawAndSwap(viewport, clip, transform, frame_size_,
                          cc::SurfaceId(frame_sink_id_, child_id_));
 }
 
 void HardwareRenderer::AllocateSurface() {
   DCHECK(child_id_.is_null());
-  DCHECK(surface_factory_);
   child_id_ = surface_id_allocator_->GenerateId();
   surface_factory_->Create(child_id_);
   surfaces_->AddChildId(cc::SurfaceId(frame_sink_id_, child_id_));
 }
 
 void HardwareRenderer::DestroySurface() {
   DCHECK(!child_id_.is_null());
-  DCHECK(surface_factory_);
 
   // Submit an empty frame to force any existing resources to be returned.
   surface_factory_->SubmitCompositorFrame(child_id_, cc::CompositorFrame(),
                                           cc::SurfaceFactory::DrawCallback());
 
   surfaces_->RemoveChildId(cc::SurfaceId(frame_sink_id_, child_id_));
   surface_factory_->Destroy(child_id_);
   child_id_ = cc::LocalFrameId();
 }
 
@@ skipping 27 matching lines @@
     const cc::ReturnedResourceArray& resources,
     const CompositorID& compositor_id,
     uint32_t compositor_frame_sink_id) {
   if (compositor_frame_sink_id != last_committed_compositor_frame_sink_id_)
     return;
   render_thread_manager_->InsertReturnedResourcesOnRT(resources, compositor_id,
                                                       compositor_frame_sink_id);
 }
 
 }  // namespace android_webview