Separate motion event touch geometry orientation from stylus orientation.

content/browser/renderer_host/input/motion_event_android_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <android/input.h>
 
 #include "base/android/jni_android.h"
 #include "content/browser/renderer_host/input/motion_event_android.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
@@ skipping 57 matching lines @@
   EXPECT_EQ(p1.pos_x_pixels * kPixToDip, event.GetX(1));
   EXPECT_EQ(p1.pos_y_pixels * kPixToDip, event.GetY(1));
   EXPECT_FLOAT_EQ((p0.pos_x_pixels + raw_offset) * kPixToDip, event.GetRawX(0));
   EXPECT_FLOAT_EQ((p0.pos_y_pixels - raw_offset) * kPixToDip, event.GetRawY(0));
   EXPECT_FLOAT_EQ((p1.pos_x_pixels + raw_offset) * kPixToDip, event.GetRawX(1));
   EXPECT_FLOAT_EQ((p1.pos_y_pixels - raw_offset) * kPixToDip, event.GetRawY(1));
   EXPECT_EQ(p0.touch_major_pixels * kPixToDip, event.GetTouchMajor(0));
   EXPECT_EQ(p1.touch_major_pixels * kPixToDip, event.GetTouchMajor(1));
   EXPECT_EQ(p0.touch_minor_pixels * kPixToDip, event.GetTouchMinor(0));
   EXPECT_EQ(p1.touch_minor_pixels * kPixToDip, event.GetTouchMinor(1));
-  EXPECT_EQ(p0.orientation_rad, event.GetOrientation(0));
-  EXPECT_EQ(p1.orientation_rad, event.GetOrientation(1));
+  EXPECT_EQ(p0.orientation_rad, event.GetTouchOrientation(0));
+  EXPECT_EQ(p1.orientation_rad, event.GetTouchOrientation(1));
   EXPECT_EQ(p0.id, event.GetPointerId(0));
   EXPECT_EQ(p1.id, event.GetPointerId(1));
   EXPECT_EQ(MotionEvent::TOOL_TYPE_FINGER, event.GetToolType(0));
   EXPECT_EQ(MotionEvent::TOOL_TYPE_FINGER, event.GetToolType(1));
   EXPECT_EQ(MotionEvent::BUTTON_PRIMARY, event.GetButtonState());
   EXPECT_EQ(ui::EF_ALT_DOWN, event.GetFlags());
   EXPECT_EQ(static_cast<size_t>(pointer_count), event.GetPointerCount());
   EXPECT_EQ(static_cast<size_t>(history_size), event.GetHistorySize());
 }
 
@@ skipping 68 matching lines @@
                            pointer_count,
                            0,
                            0,
                            0,
                            0,
                            0,
                            0,
                            p0,
                            p1);
 
-  EXPECT_EQ(0.f, event.GetOrientation(0));
-  EXPECT_EQ(0.f, event.GetOrientation(1));
+  EXPECT_EQ(0.f, event.GetTouchOrientation(0));
+  EXPECT_EQ(0.f, event.GetTouchOrientation(1));
 }
 
 TEST(MotionEventAndroidTest, NonEmptyHistoryForNonMoveEventsSanitized) {
   int pointer_count = 1;
   size_t history_size = 5;
   MotionEventAndroid::Pointer p0(0, 0, 0, 0, 0, 0, 0);
   MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0);
   MotionEventAndroid event(kPixToDip,
                            base::android::AttachCurrentThread(),
                            nullptr,
@@ skipping 33 matching lines @@
                            0,
                            0,
                            p0,
                            p1);
 
   EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction());
   EXPECT_EQ(action_index, event.GetActionIndex());
 }
 
 }  // namespace content