Move SharedRendererState ownership to AwContents

android_webview/browser/browser_view_renderer_unittest.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 <map>
 #include <queue>
 #include <utility>
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/child_frame.h"
@@ skipping 60 matching lines @@
   void WillOnDraw() override {
     RenderingTest::WillOnDraw();
     // Step 0: A single onDraw on screen. The parent draw constraints
     // of the BVR will updated to be the initial constraints.
     // Step 1: A single onDrraw off screen. The parent draw constraints of the
     // BVR will be updated to the new constraints.
     // Step 2: This onDraw is to introduce the DrawGL that animates the
     // webview onto the screen on render thread. End the test when the parent
     // draw constraints of BVR is updated to initial constraints.
     if (on_draw_count_ == 1 || on_draw_count_ == 2)
-      browser_view_renderer_->PrepareToDraw(gfx::Vector2d(), gfx::Rect());
+      browser_view_renderer_->PrepareToDraw(gfx::Rect());
   }
 
   void DidOnDraw(bool success) override {
     EXPECT_TRUE(success);
     on_draw_count_++;
   }
 
   bool WillDrawOnRT(SharedRendererState* functor,
                     AwDrawGLInfo* draw_info) override {
     if (draw_gl_count_on_rt_ == 1) {
@@ skipping 24 matching lines @@
       const ParentCompositorDrawConstraints& constraints1,
       const ParentCompositorDrawConstraints& constraints2) {
     if (constraints1.is_layer != constraints2.is_layer ||
         constraints1.transform != constraints2.transform)
       return false;
 
     return !constraints1.is_layer ||
            constraints1.surface_rect_empty == constraints2.surface_rect_empty;
   }
 
-  void ParentDrawConstraintsUpdated(
+  void DrawConstraintsUpdated(
       const ParentCompositorDrawConstraints& constraints) override {
     switch (on_draw_count_) {
       case 1u:
         EXPECT_TRUE(DrawConstraintsEquals(constraints, new_constraints_));
         break;
       case 3u:
         EXPECT_TRUE(DrawConstraintsEquals(constraints, initial_constraints_));
         EndTest();
         break;
       // There will be a following 4th onDraw. But the hardware renderer won't
@@ skipping 140 matching lines @@
 
  private:
   std::queue<content::SynchronousCompositor::Frame> frames_;
   uint32_t last_output_surface_id_;
   std::map<cc::ResourceId, int> expected_return_count_;
 };
 
 RENDERING_TEST_F(SwitchOutputSurfaceIdTest);
 
 }  // namespace android_webview