Index: components/scheduler/renderer/web_view_scheduler_impl_unittest.cc |
diff --git a/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc b/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc |
index 401b39a022c04938ad2106c6bff504836c7d8321..dfd15e0d718011201a6156b29b627c367f1885bb 100644 |
--- a/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc |
+++ b/components/scheduler/renderer/web_view_scheduler_impl_unittest.cc |
@@ -13,6 +13,8 @@ |
#include "components/scheduler/renderer/renderer_scheduler_impl.h" |
#include "components/scheduler/renderer/web_frame_scheduler_impl.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "third_party/WebKit/public/platform/WebTaskRunner.h" |
+#include "third_party/WebKit/public/platform/WebTraceLocation.h" |
namespace scheduler { |
@@ -30,7 +32,7 @@ class WebViewSchedulerImplTest : public testing::Test { |
mock_task_runner_, make_scoped_ptr(new TestTimeSource(clock_.get()))); |
scheduler_.reset(new RendererSchedulerImpl(main_task_runner_)); |
web_view_scheduler_.reset( |
- new WebViewSchedulerImpl(nullptr, scheduler_.get())); |
+ new WebViewSchedulerImpl(nullptr, scheduler_.get(), "test.category")); |
} |
void TearDown() override { scheduler_->Shutdown(); } |
@@ -57,4 +59,101 @@ TEST_F(WebViewSchedulerImplTest, TestDestructionOfFrameSchedulersAfter) { |
web_view_scheduler_.reset(); |
} |
+TEST_F(WebViewSchedulerImplTest, DelayToNextRunTimeInSeconds) { |
+ EXPECT_FLOAT_EQ( |
+ 1.0, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.0)); |
+ EXPECT_FLOAT_EQ( |
+ 0.9, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.1)); |
+ EXPECT_FLOAT_EQ( |
+ 0.8, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.2)); |
+ EXPECT_FLOAT_EQ( |
+ 0.7, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.3)); |
+ EXPECT_FLOAT_EQ( |
+ 0.6, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.4)); |
+ EXPECT_FLOAT_EQ( |
+ 0.5, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.5)); |
+ EXPECT_FLOAT_EQ( |
+ 0.4, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.6)); |
+ EXPECT_FLOAT_EQ( |
+ 0.3, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.7)); |
+ EXPECT_FLOAT_EQ( |
+ 0.2, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.8)); |
+ EXPECT_FLOAT_EQ( |
+ 1.1, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(0.9)); |
+ EXPECT_FLOAT_EQ( |
+ 1.0, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(1.0)); |
+ EXPECT_FLOAT_EQ( |
+ 1.0, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(8.0)); |
+ EXPECT_FLOAT_EQ( |
+ 0.8, (float)WebViewSchedulerImpl::DelayToNextRunTimeInSeconds(8.2)); |
+} |
+ |
+namespace { |
+class RepeatingTask : public blink::WebTaskRunner::Task { |
+ public: |
+ RepeatingTask(blink::WebTaskRunner* web_task_runner, int* run_count) |
+ : web_task_runner_(web_task_runner), run_count_(run_count) {} |
+ |
+ ~RepeatingTask() override {} |
+ |
+ void run() override { |
+ (*run_count_)++; |
+ web_task_runner_->postDelayedTask( |
+ BLINK_FROM_HERE, new RepeatingTask(web_task_runner_, run_count_), 1.0); |
+ } |
+ |
+ private: |
+ blink::WebTaskRunner* web_task_runner_; // NOT OWNED |
+ int* run_count_; // NOT OWNED |
+}; |
+} // namespace |
+ |
+TEST_F(WebViewSchedulerImplTest, RepeatingTimer_PageInForeground) { |
+ web_view_scheduler_->setPageInBackground(false); |
+ |
+ blink::WebPassOwnPtr<blink::WebFrameScheduler> frame( |
Sami
2015/11/17 10:12:21
Looks like this could just be a regular OwnPtr, wh
alex clarke (OOO till 29th)
2015/11/23 17:13:46
As discussed I ended up adding a new method to exp
|
+ web_view_scheduler_->createFrameScheduler()); |
+ |
+ int run_count = 0; |
+ frame.get()->timerTaskRunner()->postDelayedTask( |
+ BLINK_FROM_HERE, |
+ new RepeatingTask(frame.get()->timerTaskRunner(), &run_count), 1.0); |
+ |
+ mock_task_runner_->SetAutoAdvanceNowToPendingTasks(true); |
+ mock_task_runner_->RunForPeriod(base::TimeDelta::FromSeconds(1)); |
+ EXPECT_EQ(1000, run_count); |
+} |
+ |
+TEST_F(WebViewSchedulerImplTest, RepeatingTimer_PageInBackground) { |
+ web_view_scheduler_->setPageInBackground(true); |
+ |
+ blink::WebPassOwnPtr<blink::WebFrameScheduler> frame( |
+ web_view_scheduler_->createFrameScheduler()); |
+ |
+ int run_count = 0; |
+ frame.get()->timerTaskRunner()->postDelayedTask( |
+ BLINK_FROM_HERE, |
+ new RepeatingTask(frame.get()->timerTaskRunner(), &run_count), 1.0); |
+ |
+ mock_task_runner_->SetAutoAdvanceNowToPendingTasks(true); |
+ mock_task_runner_->RunForPeriod(base::TimeDelta::FromSeconds(1)); |
+ EXPECT_EQ(1, run_count); |
+} |
+ |
+TEST_F(WebViewSchedulerImplTest, RepeatingLoadingTask_PageInBackground) { |
+ web_view_scheduler_->setPageInBackground(true); |
+ |
+ blink::WebPassOwnPtr<blink::WebFrameScheduler> frame( |
+ web_view_scheduler_->createFrameScheduler()); |
+ |
+ int run_count = 0; |
+ frame.get()->loadingTaskRunner()->postDelayedTask( |
+ BLINK_FROM_HERE, |
+ new RepeatingTask(frame.get()->loadingTaskRunner(), &run_count), 1.0); |
+ |
+ mock_task_runner_->SetAutoAdvanceNowToPendingTasks(true); |
+ mock_task_runner_->RunForPeriod(base::TimeDelta::FromSeconds(1)); |
+ EXPECT_EQ(1000, run_count); // Loading tasks should not be throttled |
+} |
+ |
} // namespace scheduler |