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

Unified Diff: ui/android/java/src/org/chromium/ui/base/ViewRoot.java

Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree (Closed)
Patch Set: - Created 3 years, 10 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: ui/android/java/src/org/chromium/ui/base/ViewRoot.java
diff --git a/ui/android/java/src/org/chromium/ui/base/ViewRoot.java b/ui/android/java/src/org/chromium/ui/base/ViewRoot.java
index 291c3af7b78f7afa2914567073d4756e7bc1f134..a9dc2d54efe6c481b2cb0ec63766cad0d7764d2e 100644
--- a/ui/android/java/src/org/chromium/ui/base/ViewRoot.java
+++ b/ui/android/java/src/org/chromium/ui/base/ViewRoot.java
@@ -52,27 +52,21 @@ public class ViewRoot {
}
}
- return nativeOnTouchEvent(getNativePtr(), event,
- event.getEventTime(), event.getActionMasked(),
- pointerCount, event.getHistorySize(), event.getActionIndex(),
- event.getX(), event.getY(),
- pointerCount > 1 ? event.getX(1) : 0,
- pointerCount > 1 ? event.getY(1) : 0,
- event.getPointerId(0), pointerCount > 1 ? event.getPointerId(1) : -1,
- touchMajor[0], touchMajor[1],
- touchMinor[0], touchMinor[1],
- event.getOrientation(), pointerCount > 1 ? event.getOrientation(1) : 0,
+ return nativeOnTouchEvent(getNativePointer(), event, event.getEventTime(),
+ event.getActionMasked(), pointerCount, event.getHistorySize(),
+ event.getActionIndex(), event.getX(), event.getY(),
+ pointerCount > 1 ? event.getX(1) : 0, pointerCount > 1 ? event.getY(1) : 0,
+ event.getPointerId(0), pointerCount > 1 ? event.getPointerId(1) : -1, touchMajor[0],
+ touchMajor[1], touchMinor[0], touchMinor[1], event.getOrientation(),
+ pointerCount > 1 ? event.getOrientation(1) : 0,
event.getAxisValue(MotionEvent.AXIS_TILT),
pointerCount > 1 ? event.getAxisValue(MotionEvent.AXIS_TILT, 1) : 0,
- event.getRawX(), event.getRawY(),
- event.getToolType(0),
+ event.getRawX(), event.getRawY(), event.getToolType(0),
pointerCount > 1 ? event.getToolType(1) : MotionEvent.TOOL_TYPE_UNKNOWN,
- event.getButtonState(),
- event.getMetaState(),
- isTouchHandleEvent);
+ event.getButtonState(), event.getMetaState(), isTouchHandleEvent);
}
- public long getNativePtr() {
+ public long getNativePointer() {
if (mNativeView == 0) mNativeView = nativeInit(mWindowAndroid.getNativePointer());
return mNativeView;
}

Powered by Google App Engine
This is Rietveld 408576698