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

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

Issue 2863693003: Unify TouchAction classes (Closed)
Patch Set: add cstdlib 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/core/input/TouchEventManager.cpp
diff --git a/third_party/WebKit/Source/core/input/TouchEventManager.cpp b/third_party/WebKit/Source/core/input/TouchEventManager.cpp
index fa285afc85cc5c0f3566b42f9a390ae597d7b147..7505b622e2493554db2404f460e56dc65675aae3 100644
--- a/third_party/WebKit/Source/core/input/TouchEventManager.cpp
+++ b/third_party/WebKit/Source/core/input/TouchEventManager.cpp
@@ -107,7 +107,7 @@ void TouchEventManager::Clear() {
region_for_touch_id_.clear();
touch_pressed_ = false;
suppressing_touchmoves_within_slop_ = false;
- current_touch_action_ = kTouchActionAuto;
+ current_touch_action_ = TouchAction::kTouchActionAuto;
}
DEFINE_TRACE(TouchEventManager) {
@@ -197,7 +197,7 @@ WebInputEventResult TouchEventManager::DispatchTouchEvents(
if (all_touches_released) {
touch_sequence_document_.Clear();
- current_touch_action_ = kTouchActionAuto;
+ current_touch_action_ = TouchAction::kTouchActionAuto;
}
WebInputEventResult event_result = WebInputEventResult::kNotHandled;
@@ -369,7 +369,7 @@ void TouchEventManager::UpdateTargetAndRegionMapsForTouchStarts(
TouchAction effective_touch_action =
TouchActionUtil::ComputeEffectiveTouchAction(*touch_info.touch_node);
- if (effective_touch_action != kTouchActionAuto) {
+ if (effective_touch_action != TouchAction::kTouchActionAuto) {
frame_->GetPage()->GetChromeClient().SetTouchAction(
frame_, effective_touch_action);
« no previous file with comments | « third_party/WebKit/Source/core/input/TouchEventManager.h ('k') | third_party/WebKit/Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698