Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp

Issue 1646663002: Refactor Scroll Customization to share cc::ScrollStateData with blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix linking. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp
index 6c7a1a90053f5a78cc65b3f43dfb4815254d765b..c44546df2a0386dfc4b0fb97cf7bca558a89d183 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp
@@ -10,6 +10,18 @@
namespace blink {
+namespace {
+
+PassRefPtrWillBeRawPtr<ScrollState> CreateScrollState(double deltaX, double deltaY, bool beginning, bool ending)
+{
+ OwnPtr<ScrollStateData> scrollStateData = adoptPtr(new ScrollStateData());
+ scrollStateData->delta_x = deltaX;
+ scrollStateData->delta_y = deltaY;
+ scrollStateData->is_beginning = beginning;
+ scrollStateData->is_ending = ending;
+ return ScrollState::create(scrollStateData.release());
+}
+
class ScrollStateTest : public testing::Test {
};
@@ -21,7 +33,7 @@ TEST_F(ScrollStateTest, ConsumeDeltaNative)
const float deltaXToConsume = 1.2;
const float deltaYToConsume = 2.3;
- RefPtrWillBeRawPtr<ScrollState> scrollState = ScrollState::create(deltaX, deltaY, 0, 0, 0, false, false);
+ RefPtrWillBeRawPtr<ScrollState> scrollState = CreateScrollState(deltaX, deltaY, false, false);
EXPECT_FLOAT_EQ(deltaX, scrollState->deltaX());
EXPECT_FLOAT_EQ(deltaY, scrollState->deltaY());
EXPECT_FALSE(scrollState->deltaConsumedForScrollSequence());
@@ -52,8 +64,7 @@ TEST_F(ScrollStateTest, ConsumeDeltaNative)
TEST_F(ScrollStateTest, CurrentNativeScrollingElement)
{
- RefPtrWillBeRawPtr<ScrollState> scrollState =
- ScrollState::create(0, 0, 0, 0, 0, false, false);
+ RefPtrWillBeRawPtr<ScrollState> scrollState = CreateScrollState(0, 0, false, false);
RefPtrWillBeRawPtr<Element> element = Element::create(
QualifiedName::null(), Document::create().get());
scrollState->setCurrentNativeScrollingElement(element.get());
@@ -63,15 +74,14 @@ TEST_F(ScrollStateTest, CurrentNativeScrollingElement)
TEST_F(ScrollStateTest, FullyConsumed)
{
- RefPtrWillBeRawPtr<ScrollState> scrollStateBegin =
- ScrollState::create(0, 0, 0, 0, 0, false, true, false);
- RefPtrWillBeRawPtr<ScrollState> scrollState =
- ScrollState::create(0, 0, 0, 0, 0, false, false, false);
- RefPtrWillBeRawPtr<ScrollState> scrollStateEnd =
- ScrollState::create(0, 0, 0, 0, 0, false, false, true);
+ RefPtrWillBeRawPtr<ScrollState> scrollStateBegin = CreateScrollState(0, 0, true, false);
+ RefPtrWillBeRawPtr<ScrollState> scrollState = CreateScrollState(0, 0, false, false);
+ RefPtrWillBeRawPtr<ScrollState> scrollStateEnd = CreateScrollState(0, 0, false, true);
EXPECT_FALSE(scrollStateBegin->fullyConsumed());
EXPECT_TRUE(scrollState->fullyConsumed());
EXPECT_FALSE(scrollStateEnd->fullyConsumed());
}
+} // namespace
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698