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

Unified Diff: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)
Patch Set: none Created 3 years, 7 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/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 cd28ae53a6ec76c93cba0289fb43813867d827d2..fce377163161d019eee4ee09c7cb442f8e3e3809 100644
--- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
@@ -791,8 +791,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<uint64_t>(CompositorSubElementId::kViewport),
suzyh_UTC10 (ex-contributor) 2017/05/08 01:04:15 Is this cast necessary?
chrishtr 2017/05/08 16:32:13 Not sure. Compiles locally.. Removed it for now, w
+ SubElementIdFromCompositorElementId(
+ visualViewport.ScrollLayer()->GetElementId()));
// Ensure the location and scale were reset.
EXPECT_SIZE_EQ(FloatSize(), visualViewport.GetScrollOffset());

Powered by Google App Engine
This is Rietveld 408576698