Index: third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc |
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc |
index 022f2cd8f4f22f2a2df17d90e3ef0e502b1e87e2..d1c5dd9de7223b9fdf84cdaf4a273ee46fbef8e5 100644 |
--- a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc |
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc |
@@ -835,9 +835,9 @@ TEST_F(RendererSchedulerImplTest, TestDefaultPolicy) { |
EnableIdleTasks(); |
RunUntilIdle(); |
EXPECT_THAT(run_order, |
- testing::ElementsAre(std::string("L1"), std::string("D1"), |
- std::string("C1"), std::string("D2"), |
- std::string("C2"), std::string("I1"))); |
+ testing::ElementsAre(std::string("C1"), std::string("C2"), |
+ std::string("L1"), std::string("D1"), |
+ std::string("D2"), std::string("I1"))); |
EXPECT_EQ(RendererSchedulerImpl::UseCase::NONE, CurrentUseCase()); |
} |
@@ -1264,11 +1264,12 @@ TEST_F(RendererSchedulerImplTest, |
FakeInputEvent(blink::WebInputEvent::kMouseMove), |
RendererScheduler::InputEventState::EVENT_CONSUMED_BY_COMPOSITOR); |
RunUntilIdle(); |
+ // OOPS? |
// Note compositor tasks are not prioritized. |
Sami
2017/04/27 17:38:17
It *should* be fine to prioritize compositor tasks
Dan Elphick
2017/05/03 09:41:06
Done.
|
EXPECT_EQ(RendererSchedulerImpl::UseCase::NONE, CurrentUseCase()); |
EXPECT_THAT(run_order, |
- testing::ElementsAre(std::string("D1"), std::string("C1"), |
- std::string("D2"), std::string("C2"), |
+ testing::ElementsAre(std::string("C1"), std::string("C2"), |
+ std::string("D1"), std::string("D2"), |
std::string("I1"))); |
} |
@@ -1285,8 +1286,8 @@ TEST_F(RendererSchedulerImplTest, |
// Note compositor tasks are not prioritized. |
EXPECT_EQ(RendererSchedulerImpl::UseCase::NONE, CurrentUseCase()); |
EXPECT_THAT(run_order, |
- testing::ElementsAre(std::string("D1"), std::string("C1"), |
- std::string("D2"), std::string("C2"), |
+ testing::ElementsAre(std::string("C1"), std::string("C2"), |
+ std::string("D1"), std::string("D2"), |
std::string("I1"))); |
} |
@@ -1504,8 +1505,8 @@ TEST_F(RendererSchedulerImplTest, |
RunUntilIdle(); |
// Note compositor tasks are not prioritized. |
EXPECT_THAT(run_order, |
- testing::ElementsAre(std::string("D1"), std::string("C1"), |
- std::string("D2"), std::string("C2"), |
+ testing::ElementsAre(std::string("C1"), std::string("C2"), |
+ std::string("D1"), std::string("D2"), |
std::string("I1"))); |
EXPECT_EQ(RendererSchedulerImpl::UseCase::NONE, CurrentUseCase()); |
} |
@@ -1520,10 +1521,11 @@ TEST_F(RendererSchedulerImplTest, |
FakeInputEvent(blink::WebInputEvent::kKeyDown), |
RendererScheduler::InputEventState::EVENT_FORWARDED_TO_MAIN_THREAD); |
RunUntilIdle(); |
+ // TODO(delphick): this comment suggests we've got this wrong? |
Sami
2017/04/27 17:38:17
Similarly this test predates the "compositor is fa
Dan Elphick
2017/05/03 09:41:06
Done.
|
// Note compositor tasks are not prioritized. |
EXPECT_THAT(run_order, |
- testing::ElementsAre(std::string("D1"), std::string("C1"), |
- std::string("D2"), std::string("C2"), |
+ testing::ElementsAre(std::string("C1"), std::string("C2"), |
+ std::string("D1"), std::string("D2"), |
std::string("I1"))); |
EXPECT_EQ(RendererSchedulerImpl::UseCase::NONE, CurrentUseCase()); |
// Note compositor tasks are not prioritized. |
@@ -2359,7 +2361,7 @@ TEST_F(RendererSchedulerImplTest, SuspendRenderer) { |
EnableIdleTasks(); |
RunUntilIdle(); |
EXPECT_THAT(run_order, |
- testing::ElementsAre(std::string("D1"), std::string("C1"), |
+ testing::ElementsAre(std::string("C1"), std::string("D1"), |
std::string("I1"))); |
// The rest queued tasks fire when the tab goes foregrounded. |
@@ -2391,7 +2393,7 @@ TEST_F(RendererSchedulerImplTest, ResumeRenderer) { |
EnableIdleTasks(); |
RunUntilIdle(); |
EXPECT_THAT(run_order, |
- testing::ElementsAre(std::string("D1"), std::string("C1"), |
+ testing::ElementsAre(std::string("C1"), std::string("D1"), |
std::string("I1"))); |
// The rest queued tasks fire when the renderer is resumed. |
@@ -2409,7 +2411,7 @@ TEST_F(RendererSchedulerImplTest, ResumeRenderer) { |
EnableIdleTasks(); |
RunUntilIdle(); |
EXPECT_THAT(run_order, |
- testing::ElementsAre(std::string("D2"), std::string("C2"), |
+ testing::ElementsAre(std::string("C2"), std::string("D2"), |
std::string("I2"))); |
// The rest queued tasks fire when the renderer is resumed. |