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

Unified Diff: third_party/WebKit/Source/core/input/ScrollManager.cpp

Issue 2573073003: Collapse the API surface on WebInputEvent via accessor functions. (Closed)
Patch Set: Fix nits Created 3 years, 11 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/input/ScrollManager.cpp
diff --git a/third_party/WebKit/Source/core/input/ScrollManager.cpp b/third_party/WebKit/Source/core/input/ScrollManager.cpp
index 18e6f25fbe9c69641479abb0310e0cccf4ea9502..0a5c306b0383dd87fcb8bb7e8ec4df734fc21617 100644
--- a/third_party/WebKit/Source/core/input/ScrollManager.cpp
+++ b/third_party/WebKit/Source/core/input/ScrollManager.cpp
@@ -240,7 +240,7 @@ WebInputEventResult ScrollManager::handleGestureScrollBegin(
WebInputEventResult ScrollManager::handleGestureScrollUpdate(
const WebGestureEvent& gestureEvent) {
- DCHECK_EQ(gestureEvent.type, WebInputEvent::GestureScrollUpdate);
+ DCHECK_EQ(gestureEvent.type(), WebInputEvent::GestureScrollUpdate);
Node* node = m_scrollGestureHandlingNode.get();
if (!node || !node->layoutObject())
@@ -385,7 +385,7 @@ WebInputEventResult ScrollManager::handleGestureScrollEvent(
Node* eventTarget = nullptr;
Scrollbar* scrollbar = nullptr;
- if (gestureEvent.type != WebInputEvent::GestureScrollBegin) {
+ if (gestureEvent.type() != WebInputEvent::GestureScrollBegin) {
scrollbar = m_scrollbarHandlingScrollGesture.get();
eventTarget = m_scrollGestureHandlingNode.get();
}
@@ -440,7 +440,7 @@ WebInputEventResult ScrollManager::handleGestureScrollEvent(
}
}
- switch (gestureEvent.type) {
+ switch (gestureEvent.type()) {
case WebInputEvent::GestureScrollBegin:
return handleGestureScrollBegin(gestureEvent);
case WebInputEvent::GestureScrollUpdate:
@@ -468,7 +468,7 @@ bool ScrollManager::handleScrollGestureOnResizer(
if (gestureEvent.sourceDevice != WebGestureDeviceTouchscreen)
return false;
- if (gestureEvent.type == WebInputEvent::GestureScrollBegin) {
+ if (gestureEvent.type() == WebInputEvent::GestureScrollBegin) {
PaintLayer* layer = eventTarget->layoutObject()
? eventTarget->layoutObject()->enclosingLayer()
: nullptr;
@@ -483,7 +483,7 @@ bool ScrollManager::handleScrollGestureOnResizer(
LayoutSize(m_resizeScrollableArea->offsetFromResizeCorner(p));
return true;
}
- } else if (gestureEvent.type == WebInputEvent::GestureScrollUpdate) {
+ } else if (gestureEvent.type() == WebInputEvent::GestureScrollUpdate) {
if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode()) {
IntPoint pos = roundedIntPoint(gestureEvent.positionInRootFrame());
pos.move(gestureEvent.deltaXInRootFrame(),
@@ -491,7 +491,7 @@ bool ScrollManager::handleScrollGestureOnResizer(
m_resizeScrollableArea->resize(pos, m_offsetFromResizeCorner);
return true;
}
- } else if (gestureEvent.type == WebInputEvent::GestureScrollEnd) {
+ } else if (gestureEvent.type() == WebInputEvent::GestureScrollEnd) {
if (m_resizeScrollableArea && m_resizeScrollableArea->inResizeMode()) {
m_resizeScrollableArea->setInResizeMode(false);
m_resizeScrollableArea = nullptr;
« no previous file with comments | « third_party/WebKit/Source/core/input/MouseEventManager.cpp ('k') | third_party/WebKit/Source/platform/WebGestureEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698