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

Unified Diff: third_party/WebKit/Source/core/events/TouchEvent.h

Issue 1852663002: Oilpan: Remove WillBe types (part 9) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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: third_party/WebKit/Source/core/events/TouchEvent.h
diff --git a/third_party/WebKit/Source/core/events/TouchEvent.h b/third_party/WebKit/Source/core/events/TouchEvent.h
index 942aac0c151f11f8172b9b82c252823eb32c3da4..8cf029763c6a9d7aaea6e501439e0de4fd1f1fbf 100644
--- a/third_party/WebKit/Source/core/events/TouchEvent.h
+++ b/third_party/WebKit/Source/core/events/TouchEvent.h
@@ -41,28 +41,28 @@ public:
~TouchEvent() override;
// We only initialize sourceCapabilities when we create TouchEvent from EventHandler, null if it is from JavaScript.
- static PassRefPtrWillBeRawPtr<TouchEvent> create()
+ static RawPtr<TouchEvent> create()
{
return adoptRefWillBeNoop(new TouchEvent);
}
- static PassRefPtrWillBeRawPtr<TouchEvent> create(TouchList* touches,
+ static RawPtr<TouchEvent> create(TouchList* touches,
TouchList* targetTouches, TouchList* changedTouches,
- const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView> view,
+ const AtomicString& type, RawPtr<AbstractView> view,
PlatformEvent::Modifiers modifiers, bool cancelable, bool causesScrollingIfUncanceled,
double platformTimeStamp)
{
- return adoptRefWillBeNoop(new TouchEvent(touches, targetTouches, changedTouches, type, view,
- modifiers, cancelable, causesScrollingIfUncanceled, platformTimeStamp));
+ return new TouchEvent(touches, targetTouches, changedTouches, type, view,
+ modifiers, cancelable, causesScrollingIfUncanceled, platformTimeStamp);
}
- static PassRefPtrWillBeRawPtr<TouchEvent> create(const AtomicString& type, const TouchEventInit& initializer)
+ static RawPtr<TouchEvent> create(const AtomicString& type, const TouchEventInit& initializer)
{
- return adoptRefWillBeNoop(new TouchEvent(type, initializer));
+ return new TouchEvent(type, initializer);
}
void initTouchEvent(ScriptState*, TouchList* touches, TouchList* targetTouches,
TouchList* changedTouches, const AtomicString& type,
- PassRefPtrWillBeRawPtr<AbstractView>,
+ RawPtr<AbstractView>,
int, int, int, int, // unused useless members of web exposed API
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
@@ -70,9 +70,9 @@ public:
TouchList* targetTouches() const { return m_targetTouches.get(); }
TouchList* changedTouches() const { return m_changedTouches.get(); }
- void setTouches(PassRefPtrWillBeRawPtr<TouchList> touches) { m_touches = touches; }
- void setTargetTouches(PassRefPtrWillBeRawPtr<TouchList> targetTouches) { m_targetTouches = targetTouches; }
- void setChangedTouches(PassRefPtrWillBeRawPtr<TouchList> changedTouches) { m_changedTouches = changedTouches; }
+ void setTouches(RawPtr<TouchList> touches) { m_touches = touches; }
+ void setTargetTouches(RawPtr<TouchList> targetTouches) { m_targetTouches = targetTouches; }
+ void setChangedTouches(RawPtr<TouchList> changedTouches) { m_changedTouches = changedTouches; }
bool causesScrollingIfUncanceled() const { return m_causesScrollingIfUncanceled; }
@@ -82,7 +82,7 @@ public:
void preventDefault() override;
- PassRefPtrWillBeRawPtr<EventDispatchMediator> createMediator() override;
+ RawPtr<EventDispatchMediator> createMediator() override;
DECLARE_VIRTUAL_TRACE();
@@ -90,23 +90,23 @@ private:
TouchEvent();
TouchEvent(TouchList* touches, TouchList* targetTouches,
TouchList* changedTouches, const AtomicString& type,
- PassRefPtrWillBeRawPtr<AbstractView>, PlatformEvent::Modifiers,
+ RawPtr<AbstractView>, PlatformEvent::Modifiers,
bool cancelable, bool causesScrollingIfUncanceled,
double platformTimeStamp);
TouchEvent(const AtomicString&, const TouchEventInit&);
- RefPtrWillBeMember<TouchList> m_touches;
- RefPtrWillBeMember<TouchList> m_targetTouches;
- RefPtrWillBeMember<TouchList> m_changedTouches;
+ Member<TouchList> m_touches;
+ Member<TouchList> m_targetTouches;
+ Member<TouchList> m_changedTouches;
bool m_causesScrollingIfUncanceled;
};
class TouchEventDispatchMediator final : public EventDispatchMediator {
public:
- static PassRefPtrWillBeRawPtr<TouchEventDispatchMediator> create(PassRefPtrWillBeRawPtr<TouchEvent>);
+ static RawPtr<TouchEventDispatchMediator> create(RawPtr<TouchEvent>);
private:
- explicit TouchEventDispatchMediator(PassRefPtrWillBeRawPtr<TouchEvent>);
+ explicit TouchEventDispatchMediator(RawPtr<TouchEvent>);
TouchEvent& event() const;
DispatchEventResult dispatchEvent(EventDispatcher&) const override;
};
« no previous file with comments | « third_party/WebKit/Source/core/events/TextEvent.cpp ('k') | third_party/WebKit/Source/core/events/TouchEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698