| Index: third_party/WebKit/Source/core/events/UIEvent.h
|
| diff --git a/third_party/WebKit/Source/core/events/UIEvent.h b/third_party/WebKit/Source/core/events/UIEvent.h
|
| index 2fd908dff54b1405096bcd91e248c28ddd42862d..61d8bd9c6453bad021def75b6af2da6f83aef477 100644
|
| --- a/third_party/WebKit/Source/core/events/UIEvent.h
|
| +++ b/third_party/WebKit/Source/core/events/UIEvent.h
|
| @@ -39,22 +39,22 @@ using AbstractView = DOMWindow;
|
| class CORE_EXPORT UIEvent : public Event {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - static PassRefPtrWillBeRawPtr<UIEvent> create()
|
| + static RawPtr<UIEvent> create()
|
| {
|
| return adoptRefWillBeNoop(new UIEvent);
|
| }
|
| - static PassRefPtrWillBeRawPtr<UIEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtrWillBeRawPtr<AbstractView> view, int detail)
|
| + static RawPtr<UIEvent> create(const AtomicString& type, bool canBubble, bool cancelable, RawPtr<AbstractView> view, int detail)
|
| {
|
| - return adoptRefWillBeNoop(new UIEvent(type, canBubble, cancelable, view, detail));
|
| + return new UIEvent(type, canBubble, cancelable, view, detail);
|
| }
|
| - static PassRefPtrWillBeRawPtr<UIEvent> create(const AtomicString& type, const UIEventInit& initializer)
|
| + static RawPtr<UIEvent> create(const AtomicString& type, const UIEventInit& initializer)
|
| {
|
| - return adoptRefWillBeNoop(new UIEvent(type, initializer));
|
| + return new UIEvent(type, initializer);
|
| }
|
| ~UIEvent() override;
|
|
|
| - void initUIEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtrWillBeRawPtr<AbstractView>, int detail);
|
| - void initUIEventInternal(const AtomicString& type, bool canBubble, bool cancelable, EventTarget* relatedTarget, PassRefPtrWillBeRawPtr<AbstractView>, int detail, InputDeviceCapabilities* sourceCapabilities);
|
| + void initUIEvent(const AtomicString& type, bool canBubble, bool cancelable, RawPtr<AbstractView>, int detail);
|
| + void initUIEventInternal(const AtomicString& type, bool canBubble, bool cancelable, EventTarget* relatedTarget, RawPtr<AbstractView>, int detail, InputDeviceCapabilities* sourceCapabilities);
|
|
|
| AbstractView* view() const { return m_view.get(); }
|
| int detail() const { return m_detail; }
|
| @@ -70,16 +70,16 @@ public:
|
| protected:
|
| UIEvent();
|
| // TODO(crbug.com/563542): Remove of this ctor in favor of making platformTimeStamp (and perhaps sourceCapabilities) required in all constructions sites
|
| - UIEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtrWillBeRawPtr<AbstractView>, int detail, InputDeviceCapabilities* sourceCapabilities = nullptr);
|
| - UIEvent(const AtomicString& type, bool canBubble, bool cancelable, EventTarget* relatedTarget, PassRefPtrWillBeRawPtr<AbstractView>, int detail, InputDeviceCapabilities* sourceCapabilities = nullptr);
|
| - UIEvent(const AtomicString& type, bool canBubble, bool cancelable, double platformTimeStamp, PassRefPtrWillBeRawPtr<AbstractView>, int detail, InputDeviceCapabilities* sourceCapabilities);
|
| - UIEvent(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, EventTarget* relatedTarget, double platformTimeStamp, PassRefPtrWillBeRawPtr<AbstractView> viewArg, int detailArg, InputDeviceCapabilities* sourceCapabilitiesArg);
|
| + UIEvent(const AtomicString& type, bool canBubble, bool cancelable, RawPtr<AbstractView>, int detail, InputDeviceCapabilities* sourceCapabilities = nullptr);
|
| + UIEvent(const AtomicString& type, bool canBubble, bool cancelable, EventTarget* relatedTarget, RawPtr<AbstractView>, int detail, InputDeviceCapabilities* sourceCapabilities = nullptr);
|
| + UIEvent(const AtomicString& type, bool canBubble, bool cancelable, double platformTimeStamp, RawPtr<AbstractView>, int detail, InputDeviceCapabilities* sourceCapabilities);
|
| + UIEvent(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, EventTarget* relatedTarget, double platformTimeStamp, RawPtr<AbstractView> viewArg, int detailArg, InputDeviceCapabilities* sourceCapabilitiesArg);
|
| UIEvent(const AtomicString&, const UIEventInit&);
|
|
|
| private:
|
| - RefPtrWillBeMember<AbstractView> m_view;
|
| + Member<AbstractView> m_view;
|
| int m_detail;
|
| - PersistentWillBeMember<InputDeviceCapabilities> m_sourceCapabilities;
|
| + Member<InputDeviceCapabilities> m_sourceCapabilities;
|
| };
|
|
|
| } // namespace blink
|
|
|