Fix TestingPlatformSupportWithMockScheduler::runForPeriodSeconds

third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 #include "base/command_line.h"
 #include "base/memory/discardable_memory_allocator.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/test/icu_test_util.h"
 #include "base/test/test_discardable_memory_allocator.h"
 #include "cc/blink/web_compositor_support_impl.h"
 #include "cc/test/ordered_simple_task_runner.h"
 #include "platform/HTTPNames.h"
 #include "platform/heap/Heap.h"
+#include "platform/scheduler/base/real_time_domain.h"
+#include "platform/scheduler/base/task_queue_manager.h"
 #include "platform/scheduler/base/test_time_source.h"
 #include "platform/scheduler/child/scheduler_tqm_delegate_for_test.h"
 #include "platform/scheduler/renderer/renderer_scheduler_impl.h"
 #include "public/platform/WebContentLayer.h"
 #include "public/platform/WebExternalTextureLayer.h"
 #include "public/platform/WebImageLayer.h"
 #include "public/platform/WebScrollbarLayer.h"
 #include "wtf/CryptographicallyRandomNumber.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PtrUtil.h"
@@ skipping 160 matching lines @@
   m_mockTaskRunner->RunPendingTasks();
   m_mockTaskRunner->ClearRunTaskLimit();
 }
 
 void TestingPlatformSupportWithMockScheduler::runUntilIdle() {
   m_mockTaskRunner->RunUntilIdle();
 }
 
 void TestingPlatformSupportWithMockScheduler::runForPeriodSeconds(
     double seconds) {
-  m_mockTaskRunner->RunForPeriod(base::TimeDelta::FromSecondsD(seconds));
+  const base::TimeTicks deadline =
+      m_clock->NowTicks() + base::TimeDelta::FromSecondsD(seconds);
+
+  scheduler::TaskQueueManager* taskQueueManager =
+      m_scheduler->GetSchedulerHelperForTesting()
+          ->GetTaskQueueManagerForTesting();
+
+  for (;;) {
+    // If we've run out of immediate work then fast forward to the next delayed
+    // task, but don't pass |deadline|.
+    if (!taskQueueManager->HasImmediateWorkForTesting()) {
+      base::TimeTicks nextDelayedTask;
+      if (!taskQueueManager->real_time_domain()->NextScheduledRunTime(
+              &nextDelayedTask) ||
+          nextDelayedTask > deadline) {
+        break;
+      }
+
+      m_clock->SetNowTicks(nextDelayedTask);
+    }
+
+    if (m_clock->NowTicks() > deadline)
+      break;
+
+    m_mockTaskRunner->RunPendingTasks();
+  }
+
+  m_clock->SetNowTicks(deadline);
 }
 
 void TestingPlatformSupportWithMockScheduler::advanceClockSeconds(
     double seconds) {
   m_clock->Advance(base::TimeDelta::FromSecondsD(seconds));
 }
 
 void TestingPlatformSupportWithMockScheduler::setAutoAdvanceNowToPendingTasks(
     bool autoAdvance) {
   m_mockTaskRunner->SetAutoAdvanceNowToPendingTasks(autoAdvance);
@@ skipping 50 matching lines @@
   ProcessHeap::init();
   ThreadState::attachMainThread();
   ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr, nullptr,
                                                    nullptr);
   HTTPNames::init();
 }
 
 ScopedUnittestsEnvironmentSetup::~ScopedUnittestsEnvironmentSetup() {}
 
 }  // namespace blink