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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/page/scrolling/ScrollState.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
« third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h ('K') | « third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h ('k') | third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.cpp » ('j') | third_party/WebKit/Source/platform/graphics/CompositorElementId.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
index c28dc3770c577fcfcaf88c1f737a99ab704d2db8..f1d4b356bc2b44fc22dfbec1a079ffc9b3bf816b 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollState.cpp
@@ -93,8 +93,9 @@ void ScrollState::ConsumeDeltaNative(double x, double y) {
}
Element* ScrollState::CurrentNativeScrollingElement() const {
- uint64_t element_id = data_->current_native_scrolling_element().primaryId;
- if (element_id == 0)
+ uint64_t element_id = DomNodeIdFromCompositorElementId(
suzyh_UTC10 (ex-contributor) 2017/05/05 04:27:30 Is uint64_t the right type here?
+ data_->current_native_scrolling_element());
+ if (element_id == kInvalidElementId)
return nullptr;
return ElementForId(element_id);
}
« third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h ('K') | « third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.h ('k') | third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.cpp » ('j') | third_party/WebKit/Source/platform/graphics/CompositorElementId.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698