Initialize cc::Renderer in vsync

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/synchronization/lock.h"
 #include "cc/animation/timing_function.h"
@@ skipping 1549 matching lines @@
     EXPECT_EQ(2, num_complete_commits_);
   }
 
  private:
   int num_commits_deferred_;
   int num_complete_commits_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits);
 
-class LayerTreeHostWithProxy : public LayerTreeHost {
- public:
+class LayerTreeHostWithProxy : public LayerTreeHost { public:

[danakj, 2013/04/10 16:40:14]

typo here

   LayerTreeHostWithProxy(FakeLayerTreeHostClient* client,
                          const LayerTreeSettings& settings,
-                         scoped_ptr<Proxy> proxy)
+                         scoped_ptr<FakeProxy> proxy)
       : LayerTreeHost(client, settings) {
-    EXPECT_TRUE(InitializeForTesting(proxy.Pass()));
+    proxy->SetHost(this);
+    EXPECT_TRUE(InitializeForTesting(proxy.PassAs<Proxy>()));
   }
 };
 
 TEST(LayerTreeHostTest, LimitPartialUpdates) {
   // When partial updates are not allowed, max updates should be 0.
   {
     FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);
 
     scoped_ptr<FakeProxy> proxy =
         make_scoped_ptr(new FakeProxy(scoped_ptr<Thread>()));
     proxy->GetRendererCapabilities().allow_partial_texture_updates = false;
     proxy->SetMaxPartialTextureUpdates(5);
 
     LayerTreeSettings settings;
     settings.max_partial_texture_updates = 10;
 
-    LayerTreeHostWithProxy host(&client, settings, proxy.PassAs<Proxy>());
+    LayerTreeHostWithProxy host(&client, settings, proxy.Pass());
     EXPECT_TRUE(host.InitializeRendererIfNeeded());
 
     EXPECT_EQ(0u, host.settings().max_partial_texture_updates);
   }
 
   // When partial updates are allowed,
   // max updates should be limited by the proxy.
   {
     FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);
 
     scoped_ptr<FakeProxy> proxy =
         make_scoped_ptr(new FakeProxy(scoped_ptr<Thread>()));
     proxy->GetRendererCapabilities().allow_partial_texture_updates = true;
     proxy->SetMaxPartialTextureUpdates(5);
 
     LayerTreeSettings settings;
     settings.max_partial_texture_updates = 10;
 
-    LayerTreeHostWithProxy host(&client, settings, proxy.PassAs<Proxy>());
+    LayerTreeHostWithProxy host(&client, settings, proxy.Pass());
     EXPECT_TRUE(host.InitializeRendererIfNeeded());
 
     EXPECT_EQ(5u, host.settings().max_partial_texture_updates);
   }
 
   // When partial updates are allowed,
   // max updates should also be limited by the settings.
   {
     FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);
 
     scoped_ptr<FakeProxy> proxy =
         make_scoped_ptr(new FakeProxy(scoped_ptr<Thread>()));
     proxy->GetRendererCapabilities().allow_partial_texture_updates = true;
     proxy->SetMaxPartialTextureUpdates(20);
 
     LayerTreeSettings settings;
     settings.max_partial_texture_updates = 10;
 
-    LayerTreeHostWithProxy host(&client, settings, proxy.PassAs<Proxy>());
+    LayerTreeHostWithProxy host(&client, settings, proxy.Pass());
     EXPECT_TRUE(host.InitializeRendererIfNeeded());
 
     EXPECT_EQ(10u, host.settings().max_partial_texture_updates);
   }
 }
 
 TEST(LayerTreeHostTest, PartialUpdatesWithGLRenderer) {
   FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);
 
   LayerTreeSettings settings;
@@ skipping 490 matching lines @@
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->render_vsync_notification_enabled = true;
   }
 
   virtual void BeginTest() OVERRIDE {
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     FakeOutputSurface* fake_output_surface =
-        reinterpret_cast<FakeOutputSurface*>(host_impl->output_surface());
-
-    // The vsync notification is turned off now but will get enabled once we
-    // return, so post a task to trigger it.
-    ASSERT_FALSE(fake_output_surface->vsync_notification_enabled());
+        static_cast<FakeOutputSurface*>(host_impl->output_surface());
     PostVSyncOnImplThread(fake_output_surface);
   }
 
   void PostVSyncOnImplThread(FakeOutputSurface* fake_output_surface) {
     DCHECK(ImplThread());
     ImplThread()->PostTask(
-        base::Bind(&LayerTreeHostTestVSyncNotification::DidVSync,
+        base::Bind(&LayerTreeTest::DidVSync,
                    base::Unretained(this),
                    base::Unretained(fake_output_surface)));
   }
 
-  void DidVSync(FakeOutputSurface* fake_output_surface) {
-    ASSERT_TRUE(fake_output_surface->vsync_notification_enabled());
-    fake_output_surface->DidVSync(frame_time_);
-  }
-
   virtual bool PrepareToDrawOnThread(
       LayerTreeHostImpl* host_impl,
       LayerTreeHostImpl::FrameData* frame,
       bool result) OVERRIDE {
     EndTest();
     return true;
   }
 
   virtual void AfterTest() OVERRIDE {
   }
-
- private:
-  base::TimeTicks frame_time_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestVSyncNotification);
 
 }  // namespace
 }  // namespace cc