Rename SharedRendererState to RenderThreadManager

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"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/parent_compositor_draw_constraints.h"
 #include "android_webview/browser/parent_output_surface.h"
-#include "android_webview/browser/shared_renderer_state.h"
+#include "android_webview/browser/render_thread_manager.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/auto_reset.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace android_webview {
 
-HardwareRenderer::HardwareRenderer(SharedRendererState* state)
-    : shared_renderer_state_(state),
+HardwareRenderer::HardwareRenderer(RenderThreadManager* state)
+    : render_thread_manager_(state),
       last_egl_context_(eglGetCurrentContext()),
       gl_surface_(new AwGLSurface),
       compositor_id_(0u),  // Valid compositor id starts at 1.
       last_committed_output_surface_id_(0u),
       last_submitted_output_surface_id_(0u),
       output_surface_(NULL) {
   DCHECK(last_egl_context_);
 
   cc::RendererSettings settings;
 
@@ skipping 19 matching lines @@
   if (!root_id_.is_null())
     surface_factory_->Destroy(root_id_);
   if (!child_id_.is_null())
     surface_factory_->Destroy(child_id_);
   display_.reset();
   surface_factory_.reset();
   surface_manager_->UnregisterSurfaceFactoryClient(
       surface_id_allocator_->id_namespace());
 
   // Reset draw constraints.
-  shared_renderer_state_->PostExternalDrawConstraintsToChildCompositorOnRT(
+  render_thread_manager_->PostExternalDrawConstraintsToChildCompositorOnRT(
       ParentCompositorDrawConstraints());
   ReturnResourcesInChildFrame();
 }
 
 void HardwareRenderer::CommitFrame() {
   TRACE_EVENT0("android_webview", "CommitFrame");
-  scroll_offset_ = shared_renderer_state_->GetScrollOffsetOnRT();
+  scroll_offset_ = render_thread_manager_->GetScrollOffsetOnRT();
   std::unique_ptr<ChildFrame> child_frame =
-      shared_renderer_state_->PassFrameOnRT();
+      render_thread_manager_->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 62 matching lines @@
   transform.matrix().setColMajorf(draw_info->transform);
   transform.Translate(scroll_offset_.x(), scroll_offset_.y());
 
   gfx::Size viewport(draw_info->width, draw_info->height);
   // Need to post the new transform matrix back to child compositor
   // because there is no onDraw during a Render Thread animation, and child
   // compositor might not have the tiles rasterized as the animation goes on.
   ParentCompositorDrawConstraints draw_constraints(
       draw_info->is_layer, transform, viewport.IsEmpty());
   if (!child_frame_.get() || draw_constraints.NeedUpdate(*child_frame_)) {
-    shared_renderer_state_->PostExternalDrawConstraintsToChildCompositorOnRT(
+    render_thread_manager_->PostExternalDrawConstraintsToChildCompositorOnRT(
         draw_constraints);
   }
 
   if (child_id_.is_null())
     return;
 
   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);
 
@@ skipping 76 matching lines @@
   }
   child_frame_.reset();
 }
 
 void HardwareRenderer::ReturnResourcesToCompositor(
     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,
+  render_thread_manager_->InsertReturnedResourcesOnRT(resources, compositor_id,
                                                       output_surface_id);
 }
 
 }  // namespace android_webview