| Index: ui/events/event.h
|
| diff --git a/ui/events/event.h b/ui/events/event.h
|
| index 114d73ad320cd7fdfe2753c397b0669f8c4a4f9e..17d3bcca7f99b5727dbb07942c9bb9510c7b6ddc 100644
|
| --- a/ui/events/event.h
|
| +++ b/ui/events/event.h
|
| @@ -28,10 +28,6 @@ namespace gfx {
|
| class Transform;
|
| }
|
|
|
| -namespace IPC {
|
| -template <class P> struct ParamTraits;
|
| -}
|
| -
|
| namespace ui {
|
| class EventTarget;
|
| class KeyEvent;
|
| @@ -297,9 +293,6 @@ class EVENTS_EXPORT Event {
|
| private:
|
| friend class EventTestApi;
|
|
|
| - // For (de)serialization.
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| -
|
| EventType type_;
|
| std::string name_;
|
| base::TimeDelta time_stamp_;
|
| @@ -321,13 +314,6 @@ class EVENTS_EXPORT CancelModeEvent : public Event {
|
| public:
|
| CancelModeEvent();
|
| ~CancelModeEvent() override;
|
| -
|
| - private:
|
| - // For (de)serialization.
|
| - CancelModeEvent(EventType type, base::TimeDelta time_stamp, int flags)
|
| - : Event(type, time_stamp, flags) {}
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| - friend struct IPC::ParamTraits<ui::CancelModeEvent>;
|
| };
|
|
|
| class EVENTS_EXPORT LocatedEvent : public Event {
|
| @@ -372,12 +358,6 @@ class EVENTS_EXPORT LocatedEvent : public Event {
|
| protected:
|
| friend class LocatedEventTestApi;
|
|
|
| - // For (de)serialization.
|
| - LocatedEvent(EventType type, base::TimeDelta time_stamp, int flags)
|
| - : Event(type, time_stamp, flags) {}
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| - friend struct IPC::ParamTraits<ui::LocatedEvent>;
|
| -
|
| explicit LocatedEvent(const base::NativeEvent& native_event);
|
|
|
| // Create a new LocatedEvent which is identical to the provided model.
|
| @@ -438,9 +418,6 @@ struct EVENTS_EXPORT PointerDetails {
|
| tilt_y == other.tilt_y;
|
| }
|
|
|
| - // For serialization.
|
| - friend struct IPC::ParamTraits<ui::PointerDetails>;
|
| -
|
| // The type of pointer device.
|
| EventPointerType pointer_type = EventPointerType::POINTER_TYPE_UNKNOWN;
|
|
|
| @@ -563,13 +540,6 @@ class EVENTS_EXPORT MouseEvent : public LocatedEvent {
|
| pointer_details_ = details;
|
| }
|
|
|
| - protected:
|
| - // For (de)serialization.
|
| - MouseEvent(EventType type, base::TimeDelta time_stamp, int flags)
|
| - : LocatedEvent(type, time_stamp, flags) {}
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| - friend struct IPC::ParamTraits<ui::MouseEvent>;
|
| -
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(EventTest, DoubleClickRequiresRelease);
|
| FRIEND_TEST_ALL_PREFIXES(EventTest, SingleClickRightLeft);
|
| @@ -630,12 +600,6 @@ class EVENTS_EXPORT MouseWheelEvent : public MouseEvent {
|
| const gfx::Vector2d& offset() const { return offset_; }
|
|
|
| private:
|
| - // For (de)serialization.
|
| - MouseWheelEvent(EventType type, base::TimeDelta time_stamp, int flags)
|
| - : MouseEvent(type, time_stamp, flags) {}
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| - friend struct IPC::ParamTraits<ui::MouseWheelEvent>;
|
| -
|
| gfx::Vector2d offset_;
|
| };
|
|
|
| @@ -711,13 +675,6 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
|
| }
|
|
|
| private:
|
| - // For (de)serialization.
|
| - TouchEvent(EventType type, base::TimeDelta time_stamp, int flags)
|
| - : LocatedEvent(type, time_stamp, flags),
|
| - should_remove_native_touch_id_mapping_(false) {}
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| - friend struct IPC::ParamTraits<ui::TouchEvent>;
|
| -
|
| // Adjusts rotation_angle_ to within the acceptable range.
|
| void FixRotationAngle();
|
|
|
| @@ -771,13 +728,6 @@ class EVENTS_EXPORT PointerEvent : public LocatedEvent {
|
| int32_t pointer_id() const { return pointer_id_; }
|
| const PointerDetails& pointer_details() const { return details_; }
|
|
|
| - protected:
|
| - // For (de)serialization.
|
| - PointerEvent(EventType type, base::TimeDelta time_stamp, int flags)
|
| - : LocatedEvent(type, time_stamp, flags) {}
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| - friend struct IPC::ParamTraits<ui::PointerEvent>;
|
| -
|
| private:
|
| int32_t pointer_id_;
|
| PointerDetails details_;
|
| @@ -948,11 +898,6 @@ class EVENTS_EXPORT KeyEvent : public Event {
|
| void set_is_char(bool is_char) { is_char_ = is_char; }
|
|
|
| private:
|
| - // For (de)serialization.
|
| - KeyEvent(EventType type, base::TimeDelta time_stamp, int flags);
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| - friend struct IPC::ParamTraits<ui::KeyEvent>;
|
| -
|
| // Determine key_ on a keystroke event from code_ and flags().
|
| void ApplyLayout() const;
|
|
|
| @@ -1031,12 +976,6 @@ class EVENTS_EXPORT ScrollEvent : public MouseEvent {
|
| int finger_count() const { return finger_count_; }
|
|
|
| private:
|
| - // For (de)serialization.
|
| - ScrollEvent(EventType type, base::TimeDelta time_stamp, int flags)
|
| - : MouseEvent(type, time_stamp, flags) {}
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| - friend struct IPC::ParamTraits<ui::ScrollEvent>;
|
| -
|
| // Potential accelerated offsets.
|
| float x_offset_;
|
| float y_offset_;
|
| @@ -1069,12 +1008,6 @@ class EVENTS_EXPORT GestureEvent : public LocatedEvent {
|
| const GestureEventDetails& details() const { return details_; }
|
|
|
| private:
|
| - // For (de)serialization.
|
| - GestureEvent(EventType type, base::TimeDelta time_stamp, int flags)
|
| - : LocatedEvent(type, time_stamp, flags) {}
|
| - friend struct IPC::ParamTraits<ui::ScopedEvent>;
|
| - friend struct IPC::ParamTraits<ui::GestureEvent>;
|
| -
|
| GestureEventDetails details_;
|
| };
|
|
|
|
|