cc: ReadyToDraw notifications.

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/auto_reset.h"
 #include "base/synchronization/lock.h"
@@ skipping 51 matching lines @@
 using testing::_;
 using testing::AnyNumber;
 using testing::AtLeast;
 using testing::Mock;
 
 namespace cc {
 namespace {
 
 class LayerTreeHostTest : public LayerTreeTest {};
 
+// Test if the LTHI receives ReadyToActivate and ReadyToDraw notifications from
+// the TileManager.
+class LayerTreeHostTestNotifications : public LayerTreeHostTest {
+ public:
+  LayerTreeHostTestNotifications()
+      : did_notify_ready_to_activate_(false),
+        did_notify_ready_to_draw_(false) {}
+
+  void BeginTest() override { PostSetNeedsCommitToMainThread(); }
+
+  void NotifyReadyToActivateOnThread(LayerTreeHostImpl* impl) override {
+    did_notify_ready_to_activate_ = true;
+    if (did_notify_ready_to_draw_)
+      EndTest();

[danakj, 2014/11/07 19:08:18]

It's much nicer to understand the test if there is only one EndTest() in it.

[ernstm, 2014/11/08 01:57:26]

Done. I created separate tests for ReadyToActivate and for ReadyToDraw.

+  }
+
+  void NotifyReadyToDrawOnThread(LayerTreeHostImpl* impl) override {
+    did_notify_ready_to_draw_ = true;
+    if (did_notify_ready_to_activate_)
+      EndTest();
+  }
+
+  void AfterTest() override {
+    EXPECT_TRUE(did_notify_ready_to_activate_);

[danakj, 2014/11/07 19:08:18]

I was kinda expecting a test that was more long the lines of "we don't notify
ready to draw until all the raster work is done, then we do", rather than just
"a notify will happen at some point if we commit". Would that be possible?

+    EXPECT_TRUE(did_notify_ready_to_draw_);
+  }
+
+ private:
+  bool did_notify_ready_to_activate_;
+  bool did_notify_ready_to_draw_;
+};
+
+SINGLE_AND_MULTI_THREAD_IMPL_TEST_F(LayerTreeHostTestNotifications);
+
 // Two setNeedsCommits in a row should lead to at least 1 commit and at least 1
 // draw with frame 0.
 class LayerTreeHostTestSetNeedsCommit1 : public LayerTreeHostTest {
  public:
   LayerTreeHostTestSetNeedsCommit1() : num_commits_(0), num_draws_(0) {}
 
   void BeginTest() override {
     PostSetNeedsCommitToMainThread();
     PostSetNeedsCommitToMainThread();
   }
@@ skipping 5117 matching lines @@
   void AfterTest() override {
     EXPECT_TRUE(deltas_sent_to_client_);
   }
 
   ScrollAndScaleSet info_;
   bool deltas_sent_to_client_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostAcceptsDeltasFromImplWithoutRootLayer);
 }  // namespace cc