Completed webkit radiusX, radiusY and rotationAngle handling.

ui/events/gesture_detection/motion_event_buffer.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 "ui/events/gesture_detection/motion_event_buffer.h"
 
 #include "base/debug/trace_event.h"
 #include "ui/events/gesture_detection/motion_event.h"
 #include "ui/events/gesture_detection/motion_event_generic.h"
 
@@ skipping 79 matching lines @@
                                          size_t pointer_index) {
   PointerProperties result;
   result.id = event.GetPointerId(pointer_index);
   result.tool_type = event.GetToolType(pointer_index);
   result.x = event.GetX(pointer_index);
   result.y = event.GetY(pointer_index);
   result.raw_x = event.GetRawX(pointer_index);
   result.raw_y = event.GetRawY(pointer_index);
   result.pressure = event.GetPressure(pointer_index);
   result.touch_major = event.GetTouchMajor(pointer_index);
+  result.touch_minor = event.GetTouchMinor(pointer_index);
+  result.orientation = event.GetOrientation(pointer_index);
   return result;
 }
 
 PointerProperties ResamplePointer(const MotionEvent& event0,
                                   const MotionEvent& event1,
                                   size_t event0_pointer_index,
                                   size_t event1_pointer_index,
                                   float alpha) {
   DCHECK_EQ(event0.GetPointerId(event0_pointer_index),
             event1.GetPointerId(event1_pointer_index));
@@ skipping 57 matching lines @@
 // recent event used as the base event, and prior events used as the history.
 class CompoundMotionEvent : public ui::MotionEvent {
  public:
   explicit CompoundMotionEvent(MotionEventVector events)
       : events_(events.Pass()) {
     DCHECK_GE(events_.size(), 1U);
   }
   virtual ~CompoundMotionEvent() {}
 
   virtual int GetId() const OVERRIDE { return latest().GetId(); }
+
   virtual Action GetAction() const OVERRIDE { return latest().GetAction(); }
+
   virtual int GetActionIndex() const OVERRIDE {
     return latest().GetActionIndex();
   }
+
   virtual size_t GetPointerCount() const OVERRIDE {
     return latest().GetPointerCount();
   }
+
   virtual int GetPointerId(size_t pointer_index) const OVERRIDE {
     return latest().GetPointerId(pointer_index);
   }
+
   virtual float GetX(size_t pointer_index) const OVERRIDE {
     return latest().GetX(pointer_index);
   }
+
   virtual float GetY(size_t pointer_index) const OVERRIDE {
     return latest().GetY(pointer_index);
   }
+
   virtual float GetRawX(size_t pointer_index) const OVERRIDE {
     return latest().GetRawX(pointer_index);
   }
+
   virtual float GetRawY(size_t pointer_index) const OVERRIDE {
     return latest().GetRawY(pointer_index);
   }
+
   virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE {
     return latest().GetTouchMajor(pointer_index);
   }
+
+  virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE {
+    return latest().GetTouchMinor(pointer_index);
+  }
+
+  virtual float GetOrientation(size_t pointer_index) const OVERRIDE {
+    return latest().GetOrientation(pointer_index);
+  }
+
   virtual float GetPressure(size_t pointer_index) const OVERRIDE {
     return latest().GetPressure(pointer_index);
   }
+
   virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE {
     return latest().GetToolType(pointer_index);
   }
+
   virtual int GetButtonState() const OVERRIDE {
     return latest().GetButtonState();
   }
+
   virtual base::TimeTicks GetEventTime() const OVERRIDE {
     return latest().GetEventTime();
   }
+
   virtual size_t GetHistorySize() const OVERRIDE { return events_.size() - 1; }
+
   virtual base::TimeTicks GetHistoricalEventTime(
       size_t historical_index) const OVERRIDE {
     DCHECK_LT(historical_index, GetHistorySize());
     return events_[historical_index]->GetEventTime();
   }
+
   virtual float GetHistoricalTouchMajor(
       size_t pointer_index,
       size_t historical_index) const OVERRIDE {
     DCHECK_LT(historical_index, GetHistorySize());
     return events_[historical_index]->GetTouchMajor();
   }
+
   virtual float GetHistoricalX(size_t pointer_index,
                                size_t historical_index) const OVERRIDE {
     DCHECK_LT(historical_index, GetHistorySize());
     return events_[historical_index]->GetX(pointer_index);
   }
+
   virtual float GetHistoricalY(size_t pointer_index,
                                size_t historical_index) const OVERRIDE {
     DCHECK_LT(historical_index, GetHistorySize());
     return events_[historical_index]->GetY(pointer_index);
   }
+
   virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE {
     MotionEventVector cloned_events;
     cloned_events.reserve(events_.size());
     for (size_t i = 0; i < events_.size(); ++i)
       cloned_events.push_back(events_[i]->Clone().release());
     return scoped_ptr<MotionEvent>(
         new CompoundMotionEvent(cloned_events.Pass()));
   }
+
   virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE {
     return latest().Cancel();
   }
 
   // Returns the new, resampled event, or NULL if none was created.
   // TODO(jdduke): Revisit resampling to handle cases where alternating frames
   // are resampled or resampling is otherwise inconsistent, e.g., a 90hz input
   // and 60hz frame signal could phase-align such that even frames yield an
   // extrapolated event and odd frames are not resampled, crbug.com/399381.
   const MotionEvent* TryResample(base::TimeTicks resample_time,
@@ skipping 169 matching lines @@
     events.weak_clear();
     client_->ForwardMotionEvent(*event);
     return;
   }
 
   CompoundMotionEvent compound_event(events.Pass());
   client_->ForwardMotionEvent(compound_event);
 }
 
 }  // namespace ui