| Index: Source/core/html/TimeRangesTest.cpp
|
| diff --git a/Source/core/html/TimeRangesTest.cpp b/Source/core/html/TimeRangesTest.cpp
|
| index 493c4f820eeee1fdd72297e4ac094b71bbbc960a..ed2a9288825abafe970c730bad9e33405f3a26ea 100644
|
| --- a/Source/core/html/TimeRangesTest.cpp
|
| +++ b/Source/core/html/TimeRangesTest.cpp
|
| @@ -72,8 +72,8 @@ TEST(TimeRangesTest, CreateFromWebTimeRanges)
|
|
|
| TEST(TimeRangesTest, AddOrder)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangeA = TimeRanges::create();
|
| - RefPtrWillBeRawPtr<TimeRanges> rangeB = TimeRanges::create();
|
| + TimeRanges* rangeA = TimeRanges::create();
|
| + TimeRanges* rangeB = TimeRanges::create();
|
|
|
| rangeA->add(0, 2);
|
| rangeA->add(3, 4);
|
| @@ -91,7 +91,7 @@ TEST(TimeRangesTest, AddOrder)
|
|
|
| TEST(TimeRangesTest, OverlappingAdds)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> ranges = TimeRanges::create();
|
| + TimeRanges* ranges = TimeRanges::create();
|
|
|
| ranges->add(0, 2);
|
| ranges->add(10, 11);
|
| @@ -121,24 +121,24 @@ TEST(TimeRangesTest, OverlappingAdds)
|
|
|
| TEST(TimeRangesTest, IntersectWith_Self)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> ranges = TimeRanges::create(0, 2);
|
| + TimeRanges* ranges = TimeRanges::create(0, 2);
|
|
|
| ASSERT_RANGE("{ [0,2) }", ranges);
|
|
|
| - ranges->intersectWith(ranges.get());
|
| + ranges->intersectWith(ranges);
|
|
|
| ASSERT_RANGE("{ [0,2) }", ranges);
|
| }
|
|
|
| TEST(TimeRangesTest, IntersectWith_IdenticalRange)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create(0, 2);
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesB = rangesA->copy();
|
| + TimeRanges* rangesA = TimeRanges::create(0, 2);
|
| + TimeRanges* rangesB = rangesA->copy();
|
|
|
| ASSERT_RANGE("{ [0,2) }", rangesA);
|
| ASSERT_RANGE("{ [0,2) }", rangesB);
|
|
|
| - rangesA->intersectWith(rangesB.get());
|
| + rangesA->intersectWith(rangesB);
|
|
|
| ASSERT_RANGE("{ [0,2) }", rangesA);
|
| ASSERT_RANGE("{ [0,2) }", rangesB);
|
| @@ -146,13 +146,13 @@ TEST(TimeRangesTest, IntersectWith_IdenticalRange)
|
|
|
| TEST(TimeRangesTest, IntersectWith_Empty)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create(0, 2);
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| + TimeRanges* rangesA = TimeRanges::create(0, 2);
|
| + TimeRanges* rangesB = TimeRanges::create();
|
|
|
| ASSERT_RANGE("{ [0,2) }", rangesA);
|
| ASSERT_RANGE("{ }", rangesB);
|
|
|
| - rangesA->intersectWith(rangesB.get());
|
| + rangesA->intersectWith(rangesB);
|
|
|
| ASSERT_RANGE("{ }", rangesA);
|
| ASSERT_RANGE("{ }", rangesB);
|
| @@ -160,8 +160,8 @@ TEST(TimeRangesTest, IntersectWith_Empty)
|
|
|
| TEST(TimeRangesTest, IntersectWith_DisjointRanges1)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| + TimeRanges* rangesA = TimeRanges::create();
|
| + TimeRanges* rangesB = TimeRanges::create();
|
|
|
| rangesA->add(0, 1);
|
| rangesA->add(4, 5);
|
| @@ -172,7 +172,7 @@ TEST(TimeRangesTest, IntersectWith_DisjointRanges1)
|
| ASSERT_RANGE("{ [0,1) [4,5) }", rangesA);
|
| ASSERT_RANGE("{ [2,3) [6,7) }", rangesB);
|
|
|
| - rangesA->intersectWith(rangesB.get());
|
| + rangesA->intersectWith(rangesB);
|
|
|
| ASSERT_RANGE("{ }", rangesA);
|
| ASSERT_RANGE("{ [2,3) [6,7) }", rangesB);
|
| @@ -180,8 +180,8 @@ TEST(TimeRangesTest, IntersectWith_DisjointRanges1)
|
|
|
| TEST(TimeRangesTest, IntersectWith_DisjointRanges2)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| + TimeRanges* rangesA = TimeRanges::create();
|
| + TimeRanges* rangesB = TimeRanges::create();
|
|
|
| rangesA->add(0, 1);
|
| rangesA->add(4, 5);
|
| @@ -192,7 +192,7 @@ TEST(TimeRangesTest, IntersectWith_DisjointRanges2)
|
| ASSERT_RANGE("{ [0,1) [4,5) }", rangesA);
|
| ASSERT_RANGE("{ [1,4) [5,7) }", rangesB);
|
|
|
| - rangesA->intersectWith(rangesB.get());
|
| + rangesA->intersectWith(rangesB);
|
|
|
| ASSERT_RANGE("{ }", rangesA);
|
| ASSERT_RANGE("{ [1,4) [5,7) }", rangesB);
|
| @@ -200,8 +200,8 @@ TEST(TimeRangesTest, IntersectWith_DisjointRanges2)
|
|
|
| TEST(TimeRangesTest, IntersectWith_CompleteOverlap1)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| + TimeRanges* rangesA = TimeRanges::create();
|
| + TimeRanges* rangesB = TimeRanges::create();
|
|
|
| rangesA->add(1, 3);
|
| rangesA->add(4, 5);
|
| @@ -212,7 +212,7 @@ TEST(TimeRangesTest, IntersectWith_CompleteOverlap1)
|
| ASSERT_RANGE("{ [1,3) [4,5) [6,9) }", rangesA);
|
| ASSERT_RANGE("{ [0,10) }", rangesB);
|
|
|
| - rangesA->intersectWith(rangesB.get());
|
| + rangesA->intersectWith(rangesB);
|
|
|
| ASSERT_RANGE("{ [1,3) [4,5) [6,9) }", rangesA);
|
| ASSERT_RANGE("{ [0,10) }", rangesB);
|
| @@ -220,8 +220,8 @@ TEST(TimeRangesTest, IntersectWith_CompleteOverlap1)
|
|
|
| TEST(TimeRangesTest, IntersectWith_CompleteOverlap2)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| + TimeRanges* rangesA = TimeRanges::create();
|
| + TimeRanges* rangesB = TimeRanges::create();
|
|
|
| rangesA->add(1, 3);
|
| rangesA->add(4, 5);
|
| @@ -232,7 +232,7 @@ TEST(TimeRangesTest, IntersectWith_CompleteOverlap2)
|
| ASSERT_RANGE("{ [1,3) [4,5) [6,9) }", rangesA);
|
| ASSERT_RANGE("{ [1,9) }", rangesB);
|
|
|
| - rangesA->intersectWith(rangesB.get());
|
| + rangesA->intersectWith(rangesB);
|
|
|
| ASSERT_RANGE("{ [1,3) [4,5) [6,9) }", rangesA);
|
| ASSERT_RANGE("{ [1,9) }", rangesB);
|
| @@ -240,8 +240,8 @@ TEST(TimeRangesTest, IntersectWith_CompleteOverlap2)
|
|
|
| TEST(TimeRangesTest, IntersectWith_Gaps1)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| + TimeRanges* rangesA = TimeRanges::create();
|
| + TimeRanges* rangesB = TimeRanges::create();
|
|
|
| rangesA->add(0, 2);
|
| rangesA->add(4, 6);
|
| @@ -251,7 +251,7 @@ TEST(TimeRangesTest, IntersectWith_Gaps1)
|
| ASSERT_RANGE("{ [0,2) [4,6) }", rangesA);
|
| ASSERT_RANGE("{ [1,5) }", rangesB);
|
|
|
| - rangesA->intersectWith(rangesB.get());
|
| + rangesA->intersectWith(rangesB);
|
|
|
| ASSERT_RANGE("{ [1,2) [4,5) }", rangesA);
|
| ASSERT_RANGE("{ [1,5) }", rangesB);
|
| @@ -259,8 +259,8 @@ TEST(TimeRangesTest, IntersectWith_Gaps1)
|
|
|
| TEST(TimeRangesTest, IntersectWith_Gaps2)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| + TimeRanges* rangesA = TimeRanges::create();
|
| + TimeRanges* rangesB = TimeRanges::create();
|
|
|
| rangesA->add(0, 2);
|
| rangesA->add(4, 6);
|
| @@ -271,7 +271,7 @@ TEST(TimeRangesTest, IntersectWith_Gaps2)
|
| ASSERT_RANGE("{ [0,2) [4,6) [8,10) }", rangesA);
|
| ASSERT_RANGE("{ [1,9) }", rangesB);
|
|
|
| - rangesA->intersectWith(rangesB.get());
|
| + rangesA->intersectWith(rangesB);
|
|
|
| ASSERT_RANGE("{ [1,2) [4,6) [8,9) }", rangesA);
|
| ASSERT_RANGE("{ [1,9) }", rangesB);
|
| @@ -279,8 +279,8 @@ TEST(TimeRangesTest, IntersectWith_Gaps2)
|
|
|
| TEST(TimeRangesTest, IntersectWith_Gaps3)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| - RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| + TimeRanges* rangesA = TimeRanges::create();
|
| + TimeRanges* rangesB = TimeRanges::create();
|
|
|
| rangesA->add(0, 2);
|
| rangesA->add(4, 7);
|
| @@ -292,7 +292,7 @@ TEST(TimeRangesTest, IntersectWith_Gaps3)
|
| ASSERT_RANGE("{ [0,2) [4,7) [8,10) }", rangesA);
|
| ASSERT_RANGE("{ [1,5) [6,9) }", rangesB);
|
|
|
| - rangesA->intersectWith(rangesB.get());
|
| + rangesA->intersectWith(rangesB);
|
|
|
| ASSERT_RANGE("{ [1,2) [4,5) [6,7) [8,9) }", rangesA);
|
| ASSERT_RANGE("{ [1,5) [6,9) }", rangesB);
|
| @@ -300,7 +300,7 @@ TEST(TimeRangesTest, IntersectWith_Gaps3)
|
|
|
| TEST(TimeRangesTest, Nearest)
|
| {
|
| - RefPtrWillBeRawPtr<TimeRanges> ranges = TimeRanges::create();
|
| + TimeRanges* ranges = TimeRanges::create();
|
| ranges->add(0, 2);
|
| ranges->add(5, 7);
|
|
|
|
|