Commit d3f6ae4d authored by Hajime Hoshi's avatar Hajime Hoshi Committed by Commit Bot

Replace the default timer task runner usages in tests

This is part of efforts to replace non-per-frame task runners with other
appropriate per-frame task runners in the renderer.

Bug: 804694
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: Ifcbf610a71e87f5570c3c0b5ffcda97fe10bfc39
Reviewed-on: https://chromium-review.googlesource.com/886441Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Hajime Hoshi <hajimehoshi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#531868}
parent b2940b17
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
#include "public/platform/WebScrollIntoViewParams.h" #include "public/platform/WebScrollIntoViewParams.h"
#include "public/platform/WebThread.h" #include "public/platform/WebThread.h"
#include "public/platform/scheduler/test/renderer_scheduler_test_support.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
namespace { namespace {
...@@ -73,7 +74,7 @@ class ScrollableAreaStub : public GarbageCollectedFinalized<ScrollableAreaStub>, ...@@ -73,7 +74,7 @@ class ScrollableAreaStub : public GarbageCollectedFinalized<ScrollableAreaStub>,
} }
scoped_refptr<WebTaskRunner> GetTimerTaskRunner() const final { scoped_refptr<WebTaskRunner> GetTimerTaskRunner() const final {
return Platform::Current()->CurrentThread()->Scheduler()->TimerTaskRunner(); return timer_task_runner_;
} }
ScrollbarTheme& GetPageScrollbarTheme() const override { ScrollbarTheme& GetPageScrollbarTheme() const override {
...@@ -89,7 +90,8 @@ class ScrollableAreaStub : public GarbageCollectedFinalized<ScrollableAreaStub>, ...@@ -89,7 +90,8 @@ class ScrollableAreaStub : public GarbageCollectedFinalized<ScrollableAreaStub>,
: user_input_scrollable_x_(true), : user_input_scrollable_x_(true),
user_input_scrollable_y_(true), user_input_scrollable_y_(true),
viewport_size_(viewport_size), viewport_size_(viewport_size),
contents_size_(contents_size) {} contents_size_(contents_size),
timer_task_runner_(blink::scheduler::CreateWebTaskRunnerForTesting()) {}
CompositorElementId GetCompositorElementId() const override { CompositorElementId GetCompositorElementId() const override {
return CompositorElementId(); return CompositorElementId();
...@@ -131,6 +133,7 @@ class ScrollableAreaStub : public GarbageCollectedFinalized<ScrollableAreaStub>, ...@@ -131,6 +133,7 @@ class ScrollableAreaStub : public GarbageCollectedFinalized<ScrollableAreaStub>,
ScrollOffset scroll_offset_; ScrollOffset scroll_offset_;
IntSize viewport_size_; IntSize viewport_size_;
IntSize contents_size_; IntSize contents_size_;
scoped_refptr<WebTaskRunner> timer_task_runner_;
}; };
class RootFrameViewStub : public ScrollableAreaStub { class RootFrameViewStub : public ScrollableAreaStub {
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "platform/scroll/ScrollableArea.h" #include "platform/scroll/ScrollableArea.h"
#include "platform/scroll/ScrollbarThemeMock.h" #include "platform/scroll/ScrollbarThemeMock.h"
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
#include "public/platform/scheduler/test/renderer_scheduler_test_support.h"
namespace { namespace {
blink::ScrollbarThemeMock scrollbar_theme_; blink::ScrollbarThemeMock scrollbar_theme_;
...@@ -56,7 +57,10 @@ class FakeScrollableArea : public GarbageCollectedFinalized<FakeScrollableArea>, ...@@ -56,7 +57,10 @@ class FakeScrollableArea : public GarbageCollectedFinalized<FakeScrollableArea>,
} }
scoped_refptr<WebTaskRunner> GetTimerTaskRunner() const final { scoped_refptr<WebTaskRunner> GetTimerTaskRunner() const final {
return Platform::Current()->CurrentThread()->Scheduler()->TimerTaskRunner(); if (!timer_task_runner_) {
timer_task_runner_ = blink::scheduler::CreateWebTaskRunnerForTesting();
}
return timer_task_runner_;
} }
ScrollbarTheme& GetPageScrollbarTheme() const override { ScrollbarTheme& GetPageScrollbarTheme() const override {
...@@ -69,6 +73,7 @@ class FakeScrollableArea : public GarbageCollectedFinalized<FakeScrollableArea>, ...@@ -69,6 +73,7 @@ class FakeScrollableArea : public GarbageCollectedFinalized<FakeScrollableArea>,
private: private:
ScrollOffset scroll_offset_; ScrollOffset scroll_offset_;
mutable scoped_refptr<WebTaskRunner> timer_task_runner_;
}; };
} // namespace blink } // namespace blink
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "platform/scroll/ScrollbarTheme.h" #include "platform/scroll/ScrollbarTheme.h"
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
#include "public/platform/WebThread.h" #include "public/platform/WebThread.h"
#include "public/platform/scheduler/test/renderer_scheduler_test_support.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -119,7 +120,10 @@ class MockScrollableAreaForAnimatorTest ...@@ -119,7 +120,10 @@ class MockScrollableAreaForAnimatorTest
} }
scoped_refptr<WebTaskRunner> GetTimerTaskRunner() const final { scoped_refptr<WebTaskRunner> GetTimerTaskRunner() const final {
return Platform::Current()->CurrentThread()->Scheduler()->TimerTaskRunner(); if (!timer_task_runner_) {
timer_task_runner_ = blink::scheduler::CreateWebTaskRunnerForTesting();
}
return timer_task_runner_;
} }
ScrollbarTheme& GetPageScrollbarTheme() const override { ScrollbarTheme& GetPageScrollbarTheme() const override {
...@@ -143,6 +147,7 @@ class MockScrollableAreaForAnimatorTest ...@@ -143,6 +147,7 @@ class MockScrollableAreaForAnimatorTest
ScrollOffset min_offset_; ScrollOffset min_offset_;
ScrollOffset max_offset_; ScrollOffset max_offset_;
Member<ScrollAnimator> animator; Member<ScrollAnimator> animator;
mutable scoped_refptr<WebTaskRunner> timer_task_runner_;
}; };
class TestScrollAnimator : public ScrollAnimator { class TestScrollAnimator : public ScrollAnimator {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment