ContextProvider in OutputSurface

cc/resources/resource_update_controller_unittest.cc

 // Copyright 2012 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 "cc/resources/resource_update_controller.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/scheduler_test_common.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "cc/trees/single_thread_proxy.h"  // For DebugScopedSetImplThread
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 using testing::Test;
 using WebKit::WGC3Denum;
 using WebKit::WGC3Dint;
@@ skipping 96 matching lines @@
   bool IsQueryResultAvailable() {
     if (!query_results_available_)
       return false;
 
     query_results_available_--;
     return true;
   }
 
  protected:
   virtual void SetUp() {
-    output_surface_ =
-        FakeOutputSurface::Create3d(scoped_ptr<WebKit::WebGraphicsContext3D>(
-            new WebGraphicsContext3DForUploadTest(this)));
     bitmap_.setConfig(SkBitmap::kARGB_8888_Config, 300, 150);
     bitmap_.allocPixels();
 
     for (int i = 0; i < 4; i++) {
       textures_[i] = PrioritizedResource::Create(resource_manager_.get(),
                                                  gfx::Size(300, 150), GL_RGBA);
       textures_[i]->
           set_request_priority(PriorityCalculator::VisiblePriority(true));
     }
     resource_manager_->PrioritizeTextures();
 
+    output_surface_ = FakeOutputSurface::Create3d(
+        scoped_ptr<TestWebGraphicsContext3D>(
+            new WebGraphicsContext3DForUploadTest(this)));
+    CHECK(output_surface_->BindToClient(&output_surface_client_));
+
     resource_provider_ = ResourceProvider::Create(output_surface_.get(), 0);
   }
 
   void AppendFullUploadsOfIndexedTextureToUpdateQueue(int count,
                                                       int texture_index) {
     full_upload_count_expected_ += count;
     total_upload_count_expected_ += count;
 
     const gfx::Rect rect(0, 0, 300, 150);
     const ResourceUpdate upload = ResourceUpdate::Create(
@@ skipping 35 matching lines @@
                                          queue_.Pass(),
                                          resource_provider_.get());
     update_controller->Finalize();
   }
 
   void MakeQueryResultAvailable() { query_results_available_++; }
 
  protected:
   // Classes required to interact and test the ResourceUpdateController
   FakeProxy proxy_;
+  FakeOutputSurfaceClient output_surface_client_;
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<ResourceUpdateQueue> queue_;
   scoped_ptr<PrioritizedResource> textures_[4];
   scoped_ptr<PrioritizedResourceManager> resource_manager_;
   SkBitmap bitmap_;
   int query_results_available_;
 
   // Properties / expectations of this test
   int full_upload_count_expected_;
@@ skipping 304 matching lines @@
       RunPendingTask(task_runner.get(), controller.get());
   }
 
   EXPECT_FALSE(task_runner->HasPendingTask());
   EXPECT_TRUE(client.ReadyToFinalizeCalled());
   EXPECT_EQ(2, num_total_uploads_);
 }
 
 }  // namespace
 }  // namespace cc