Move SharedRendererState ownership to AwContents

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 65 matching lines @@
 
   // Reset draw constraints.
   shared_renderer_state_->PostExternalDrawConstraintsToChildCompositorOnRT(
       ParentCompositorDrawConstraints());
   ReturnResourcesInChildFrame();
 }
 
 void HardwareRenderer::CommitFrame() {
   TRACE_EVENT0("android_webview", "CommitFrame");
   scroll_offset_ = shared_renderer_state_->GetScrollOffsetOnRT();
-  scoped_ptr<ChildFrame> child_frame =
-      shared_renderer_state_->PassCompositorFrameOnRT();
+  scoped_ptr<ChildFrame> child_frame = shared_renderer_state_->PassFrameOnRT();
   if (!child_frame.get())
     return;
 
   last_committed_output_surface_id_ = child_frame->output_surface_id;
   ReturnResourcesInChildFrame();
   child_frame_ = std::move(child_frame);
   DCHECK(child_frame_->frame.get());
   DCHECK(!child_frame_->frame->gl_frame_data);
 }
 
@@ skipping 164 matching lines @@
     const cc::ReturnedResourceArray& resources,
     uint32_t compositor_id,
     uint32_t output_surface_id) {
   if (output_surface_id != last_committed_output_surface_id_)
     return;
   shared_renderer_state_->InsertReturnedResourcesOnRT(resources, compositor_id,
                                                       output_surface_id);
 }
 
 }  // namespace android_webview