cc: Make DisplayScheduler aware of resize and add tracing.

cc/surfaces/display_scheduler_unittest.cc

 // Copyright 2015 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/surfaces/display_scheduler.h"
 
 #include "base/logging.h"
 #include "base/test/null_task_runner.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 89 matching lines @@
   DisplayScheduler& scheduler() { return *scheduler_; }
 
   FakeBeginFrameSource fake_begin_frame_source_;
 
   scoped_ptr<base::SimpleTestTickClock> now_src_;
   scoped_refptr<base::NullTaskRunner> task_runner_;
   scoped_ptr<FakeDisplaySchedulerClient> client_;
   scoped_ptr<TestDisplayScheduler> scheduler_;
 };
 
-TEST_F(DisplaySchedulerTest, EntireDisplayDamagedDrawsImmediately) {
-  SurfaceId root_surface_id(1);
+TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilNewRootSurface) {
+  SurfaceId root_surface_id1(1);
+  SurfaceId root_surface_id2(2);
+  SurfaceId sid1(3);
+  base::TimeTicks late_deadline;
+
+  // Go trough an initial BeginFrame cycle with the root surface.
   BeginFrameForTest();
-  EXPECT_LT(now_src().NowTicks(),
-            scheduler_->DesiredBeginFrameDeadlineTimeForTest());
-  scheduler_->EntireDisplayDamaged(root_surface_id);
+  scheduler_->SetNewRootSurface(root_surface_id1);
+  scheduler_->BeginFrameDeadlineForTest();
+
+  // Resize on the next begin frame cycle should cause the deadline to wait
+  // for a new root surface.
+  late_deadline = now_src().NowTicks() + BeginFrameArgs::DefaultInterval();
+  BeginFrameForTest();
+  scheduler_->SurfaceDamaged(sid1);
+  EXPECT_GT(late_deadline, scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->DisplayResized();
+  EXPECT_EQ(late_deadline, scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->SetNewRootSurface(root_surface_id2);
   EXPECT_GE(now_src().NowTicks(),
             scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->BeginFrameDeadlineForTest();
+
+  // Verify deadline goes back to normal after resize.
+  late_deadline = now_src().NowTicks() + BeginFrameArgs::DefaultInterval();
+  BeginFrameForTest();
+  scheduler_->SurfaceDamaged(sid1);
+  EXPECT_GT(late_deadline, scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->SurfaceDamaged(root_surface_id2);
+  EXPECT_GE(now_src().NowTicks(),
+            scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->BeginFrameDeadlineForTest();
+}
+
+TEST_F(DisplaySchedulerTest, ResizeHasLateDeadlineUntilDamagedSurface) {
+  SurfaceId root_surface_id(1);
+  SurfaceId sid1(2);
+  base::TimeTicks late_deadline;
+
+  // Go trough an initial BeginFrame cycle with the root surface.
+  BeginFrameForTest();
+  scheduler_->SetNewRootSurface(root_surface_id);
+  scheduler_->BeginFrameDeadlineForTest();
+
+  // Resize on the next begin frame cycle should cause the deadline to wait
+  // for a new root surface.
+  late_deadline = now_src().NowTicks() + BeginFrameArgs::DefaultInterval();
+  BeginFrameForTest();
+  scheduler_->SurfaceDamaged(sid1);
+  EXPECT_GT(late_deadline, scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->DisplayResized();
+  EXPECT_EQ(late_deadline, scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->SurfaceDamaged(root_surface_id);
+  EXPECT_GE(now_src().NowTicks(),
+            scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->BeginFrameDeadlineForTest();
+
+  // Verify deadline goes back to normal after resize.
+  late_deadline = now_src().NowTicks() + BeginFrameArgs::DefaultInterval();
+  BeginFrameForTest();
+  scheduler_->SurfaceDamaged(sid1);
+  EXPECT_GT(late_deadline, scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->SurfaceDamaged(root_surface_id);
+  EXPECT_GE(now_src().NowTicks(),
+            scheduler_->DesiredBeginFrameDeadlineTimeForTest());
+  scheduler_->BeginFrameDeadlineForTest();
 }
 
 TEST_F(DisplaySchedulerTest, SurfaceDamaged) {
   SurfaceId root_surface_id(0);
   SurfaceId sid1(1);
   SurfaceId sid2(2);
 
   // Set the root surface
-  scheduler_->EntireDisplayDamaged(root_surface_id);
+  scheduler_->SetNewRootSurface(root_surface_id);
 
   // Get scheduler to detect surface 1 as active by drawing
   // two frames in a row with damage from surface 1.
   BeginFrameForTest();
   scheduler_->SurfaceDamaged(sid1);
   scheduler_->BeginFrameDeadlineForTest();
   BeginFrameForTest();
   scheduler_->SurfaceDamaged(sid1);
   scheduler_->BeginFrameDeadlineForTest();
 
@@ skipping 183 matching lines @@
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
 
   scheduler_->BeginFrameDeadlineForTest();
   scheduler_->DidSwapBuffers();
   BeginFrameForTest();
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
 
   scheduler_->DidSwapBuffersComplete();
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
 
-  scheduler_->EntireDisplayDamaged(root_surface_id);
+  scheduler_->DisplayResized();
+  EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
+
+  scheduler_->SetNewRootSurface(root_surface_id);
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
 
   scheduler_->SurfaceDamaged(sid1);
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
 
   scheduler_->SetRootSurfaceResourcesLocked(true);
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
 
   scheduler_->OutputSurfaceLost();
   EXPECT_EQ(count++, scheduler_->scheduler_begin_frame_deadline_count());
 }
 
 }  // namespace
 }  // namespace cc