diff options
Diffstat (limited to 'Source/WebCore/dom/TouchList.h')
| -rw-r--r-- | Source/WebCore/dom/TouchList.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/Source/WebCore/dom/TouchList.h b/Source/WebCore/dom/TouchList.h index b78aa4d02..7336992f3 100644 --- a/Source/WebCore/dom/TouchList.h +++ b/Source/WebCore/dom/TouchList.h @@ -13,7 +13,7 @@ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -22,11 +22,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#pragma once -#ifndef TouchList_h -#define TouchList_h - -#if PLATFORM(IOS) +#if ENABLE(IOS_TOUCH_EVENTS) #include <WebKitAdditions/TouchListIOS.h> #elif ENABLE(TOUCH_EVENTS) @@ -38,9 +36,9 @@ namespace WebCore { class TouchList : public RefCounted<TouchList> { public: - static PassRefPtr<TouchList> create() + static Ref<TouchList> create() { - return adoptRef(new TouchList); + return adoptRef(*new TouchList); } unsigned length() const { return m_values.size(); } @@ -48,16 +46,15 @@ public: Touch* item(unsigned); const Touch* item(unsigned) const; - void append(const PassRefPtr<Touch> touch) { m_values.append(touch); } + void append(Ref<Touch>&& touch) { m_values.append(WTFMove(touch)); } private: TouchList() {} - Vector<RefPtr<Touch> > m_values; + Vector<Ref<Touch>> m_values; }; } // namespace WebCore #endif // ENABLE(TOUCH_EVENTS) -#endif /* TouchList_h */ |