Index: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp |
diff --git a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp |
index 6ffa89edb756feab93eca4df5675866c6babe54d..415ee2335061a7c8042061992124e5dfdf9222c4 100644 |
--- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp |
@@ -789,8 +789,9 @@ TEST_P(VisualViewportTest, TestAttachingNewFrameSetsInnerScrollLayerSize) { |
// Ensure the scroll layer matches the frame view's size. |
EXPECT_SIZE_EQ(FloatSize(320, 240), visualViewport.ScrollLayer()->Size()); |
- EXPECT_EQ(static_cast<int>(CompositorSubElementId::kViewport), |
- visualViewport.ScrollLayer()->GetElementId().secondaryId); |
+ EXPECT_EQ(static_cast<unsigned long long>(CompositorSubElementId::kViewport), |
ajuma
2017/05/05 13:46:42
uint64_t?
chrishtr
2017/05/05 15:37:47
Done.
|
+ SubElementIdFromCompositorElementId( |
+ visualViewport.ScrollLayer()->GetElementId())); |
// Ensure the location and scale were reset. |
EXPECT_SIZE_EQ(FloatSize(), visualViewport.GetScrollOffset()); |