summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/animation/scroll_timeline_util_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/animation/scroll_timeline_util_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/animation/scroll_timeline_util_test.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/chromium/third_party/blink/renderer/core/animation/scroll_timeline_util_test.cc b/chromium/third_party/blink/renderer/core/animation/scroll_timeline_util_test.cc
index 1eeb2bdf298..223443d5116 100644
--- a/chromium/third_party/blink/renderer/core/animation/scroll_timeline_util_test.cc
+++ b/chromium/third_party/blink/renderer/core/animation/scroll_timeline_util_test.cc
@@ -53,7 +53,7 @@ TEST_F(ScrollTimelineUtilTest, ToCompositorScrollTimeline) {
)HTML");
Element* scroller = GetElementById("scroller");
- base::Optional<CompositorElementId> element_id =
+ absl::optional<CompositorElementId> element_id =
GetCompositorScrollElementId(scroller);
ASSERT_TRUE(element_id.has_value());
@@ -63,14 +63,14 @@ TEST_F(ScrollTimelineUtilTest, ToCompositorScrollTimeline) {
options->setTimeRange(
DoubleOrScrollTimelineAutoKeyword::FromDouble(time_range));
options->setOrientation("block");
- options->setStartScrollOffset(OffsetFromString(GetDocument(), "50px"));
- options->setEndScrollOffset(OffsetFromString(GetDocument(), "auto"));
+ options->setScrollOffsets({OffsetFromString(GetDocument(), "50px"),
+ OffsetFromString(GetDocument(), "auto")});
ScrollTimeline* timeline =
ScrollTimeline::Create(GetDocument(), options, ASSERT_NO_EXCEPTION);
scoped_refptr<CompositorScrollTimeline> compositor_timeline =
ToCompositorScrollTimeline(timeline);
- EXPECT_EQ(compositor_timeline->GetActiveIdForTest(), base::nullopt);
+ EXPECT_EQ(compositor_timeline->GetActiveIdForTest(), absl::nullopt);
EXPECT_EQ(compositor_timeline->GetPendingIdForTest(), element_id);
EXPECT_EQ(compositor_timeline->GetTimeRangeForTest(), time_range);
EXPECT_EQ(compositor_timeline->GetDirectionForTest(),
@@ -107,7 +107,7 @@ TEST_F(ScrollTimelineUtilTest, ToCompositorScrollTimelineNullScrollSource) {
scoped_refptr<CompositorScrollTimeline> compositor_timeline =
ToCompositorScrollTimeline(timeline);
ASSERT_TRUE(compositor_timeline.get());
- EXPECT_EQ(compositor_timeline->GetPendingIdForTest(), base::nullopt);
+ EXPECT_EQ(compositor_timeline->GetPendingIdForTest(), absl::nullopt);
}
TEST_F(ScrollTimelineUtilTest, ToCompositorScrollTimelineNullLayoutBox) {
@@ -128,8 +128,8 @@ TEST_F(ScrollTimelineUtilTest, ToCompositorScrollTimelineNullLayoutBox) {
// Here we just want to test the start/end scroll offset.
// ToCompositorScrollTimelineNullScrollSource covers the expected pending id
// and ConvertOrientationNullStyle covers the orientation conversion.
- EXPECT_EQ(compositor_timeline->GetStartScrollOffsetForTest(), base::nullopt);
- EXPECT_EQ(compositor_timeline->GetEndScrollOffsetForTest(), base::nullopt);
+ EXPECT_EQ(compositor_timeline->GetStartScrollOffsetForTest(), absl::nullopt);
+ EXPECT_EQ(compositor_timeline->GetEndScrollOffsetForTest(), absl::nullopt);
}
TEST_F(ScrollTimelineUtilTest, ConvertOrientationPhysicalCases) {
@@ -221,20 +221,20 @@ TEST_F(ScrollTimelineUtilTest, ConvertOrientationNullStyle) {
}
TEST_F(ScrollTimelineUtilTest, GetCompositorScrollElementIdNullNode) {
- EXPECT_EQ(GetCompositorScrollElementId(nullptr), base::nullopt);
+ EXPECT_EQ(GetCompositorScrollElementId(nullptr), absl::nullopt);
}
TEST_F(ScrollTimelineUtilTest, GetCompositorScrollElementIdNullLayoutObject) {
auto* div = MakeGarbageCollected<HTMLDivElement>(GetDocument());
ASSERT_FALSE(div->GetLayoutObject());
- EXPECT_EQ(GetCompositorScrollElementId(nullptr), base::nullopt);
+ EXPECT_EQ(GetCompositorScrollElementId(nullptr), absl::nullopt);
}
TEST_F(ScrollTimelineUtilTest, GetCompositorScrollElementIdNoUniqueId) {
SetBodyInnerHTML("<div id='test'></div>");
Element* test = GetElementById("test");
ASSERT_TRUE(test->GetLayoutObject());
- EXPECT_EQ(GetCompositorScrollElementId(test), base::nullopt);
+ EXPECT_EQ(GetCompositorScrollElementId(test), absl::nullopt);
}
} // namespace scroll_timeline_util