| Index: third_party/WebKit/Source/core/dom/TouchList.h
|
| diff --git a/third_party/WebKit/Source/core/dom/TouchList.h b/third_party/WebKit/Source/core/dom/TouchList.h
|
| index 6f471a28fc731a3b7150d571cbf336386140f277..46000ffff6afba3b1ac876e24be9965b779a4184 100644
|
| --- a/third_party/WebKit/Source/core/dom/TouchList.h
|
| +++ b/third_party/WebKit/Source/core/dom/TouchList.h
|
| @@ -35,24 +35,24 @@
|
|
|
| namespace blink {
|
|
|
| -class CORE_EXPORT TouchList final : public RefCountedWillBeGarbageCollected<TouchList>, public ScriptWrappable {
|
| +class CORE_EXPORT TouchList final : public GarbageCollected<TouchList>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - static PassRefPtrWillBeRawPtr<TouchList> create()
|
| + static RawPtr<TouchList> create()
|
| {
|
| return adoptRefWillBeNoop(new TouchList);
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<TouchList> create(const WillBeHeapVector<RefPtrWillBeMember<Touch>>& touches)
|
| + static RawPtr<TouchList> create(const HeapVector<Member<Touch>>& touches)
|
| {
|
| - RefPtrWillBeRawPtr<TouchList> list = adoptRefWillBeNoop(new TouchList);
|
| + RawPtr<TouchList> list = adoptRefWillBeNoop(new TouchList);
|
| list->m_values.appendVector(touches);
|
| return list.release();
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<TouchList> adopt(WillBeHeapVector<RefPtrWillBeMember<Touch>>& touches)
|
| + static RawPtr<TouchList> adopt(HeapVector<Member<Touch>>& touches)
|
| {
|
| - return adoptRefWillBeNoop(new TouchList(touches));
|
| + return new TouchList(touches);
|
| }
|
|
|
| unsigned length() const { return m_values.size(); }
|
| @@ -60,19 +60,19 @@ public:
|
| Touch* item(unsigned);
|
| const Touch* item(unsigned) const;
|
|
|
| - void append(const PassRefPtrWillBeRawPtr<Touch> touch) { m_values.append(touch); }
|
| + void append(const RawPtr<Touch> touch) { m_values.append(touch); }
|
|
|
| DECLARE_TRACE();
|
|
|
| private:
|
| TouchList() { }
|
|
|
| - TouchList(WillBeHeapVector<RefPtrWillBeMember<Touch>>& touches)
|
| + TouchList(HeapVector<Member<Touch>>& touches)
|
| {
|
| m_values.swap(touches);
|
| }
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<Touch>> m_values;
|
| + HeapVector<Member<Touch>> m_values;
|
| };
|
|
|
| } // namespace blink
|
|
|