| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2008, The Android Open Source Project | 2 * Copyright 2008, The Android Open Source Project |
| 3 * Copyright (C) 2012 Research In Motion Limited. All rights reserved. | 3 * Copyright (C) 2012 Research In Motion Limited. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above copyright | 10 * * Redistributions in binary form must reproduce the above copyright |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "core/events/EventDispatchMediator.h" | 30 #include "core/events/EventDispatchMediator.h" |
| 31 #include "core/events/MouseRelatedEvent.h" | 31 #include "core/events/MouseRelatedEvent.h" |
| 32 #include "core/dom/TouchList.h" | 32 #include "core/dom/TouchList.h" |
| 33 | 33 |
| 34 namespace WebCore { | 34 namespace WebCore { |
| 35 | 35 |
| 36 class TouchEvent FINAL : public MouseRelatedEvent { | 36 class TouchEvent FINAL : public MouseRelatedEvent { |
| 37 public: | 37 public: |
| 38 virtual ~TouchEvent(); | 38 virtual ~TouchEvent(); |
| 39 | 39 |
| 40 static PassRefPtr<TouchEvent> create() | 40 static PassRefPtrWillBeRawPtr<TouchEvent> create() |
| 41 { | 41 { |
| 42 return adoptRef(new TouchEvent); | 42 return adoptRefCountedWillBeRefCountedGarbageCollected(new TouchEvent); |
| 43 } | 43 } |
| 44 static PassRefPtr<TouchEvent> create(TouchList* touches, | 44 static PassRefPtrWillBeRawPtr<TouchEvent> create(TouchList* touches, |
| 45 TouchList* targetTouches, TouchList* changedTouches, | 45 TouchList* targetTouches, TouchList* changedTouches, |
| 46 const AtomicString& type, PassRefPtr<AbstractView> view, | 46 const AtomicString& type, PassRefPtr<AbstractView> view, |
| 47 int screenX, int screenY, int pageX, int pageY, | 47 int screenX, int screenY, int pageX, int pageY, |
| 48 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey) | 48 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey) |
| 49 { | 49 { |
| 50 return adoptRef(new TouchEvent(touches, targetTouches, changedTouches, | 50 return adoptRefCountedWillBeRefCountedGarbageCollected(new TouchEvent( |
| 51 type, view, screenX, screenY, pageX, pageY, | 51 touches, targetTouches, changedTouches, |
| 52 ctrlKey, altKey, shiftKey, metaKey)); | 52 type, view, screenX, screenY, pageX, pageY, |
| 53 ctrlKey, altKey, shiftKey, metaKey)); |
| 53 } | 54 } |
| 54 | 55 |
| 55 void initTouchEvent(TouchList* touches, TouchList* targetTouches, | 56 void initTouchEvent(TouchList* touches, TouchList* targetTouches, |
| 56 TouchList* changedTouches, const AtomicString& type, | 57 TouchList* changedTouches, const AtomicString& type, |
| 57 PassRefPtr<AbstractView> view, int screenX, int screenY, | 58 PassRefPtr<AbstractView> view, int screenX, int screenY, |
| 58 int clientX, int clientY, | 59 int clientX, int clientY, |
| 59 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey); | 60 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey); |
| 60 | 61 |
| 61 TouchList* touches() const { return m_touches.get(); } | 62 TouchList* touches() const { return m_touches.get(); } |
| 62 TouchList* targetTouches() const { return m_targetTouches.get(); } | 63 TouchList* targetTouches() const { return m_targetTouches.get(); } |
| (...skipping 30 matching lines...) Expand all Loading... |
| 93 explicit TouchEventDispatchMediator(PassRefPtr<TouchEvent>); | 94 explicit TouchEventDispatchMediator(PassRefPtr<TouchEvent>); |
| 94 TouchEvent* event() const; | 95 TouchEvent* event() const; |
| 95 virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE; | 96 virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE; |
| 96 }; | 97 }; |
| 97 | 98 |
| 98 DEFINE_EVENT_TYPE_CASTS(TouchEvent); | 99 DEFINE_EVENT_TYPE_CASTS(TouchEvent); |
| 99 | 100 |
| 100 } // namespace WebCore | 101 } // namespace WebCore |
| 101 | 102 |
| 102 #endif // TouchEvent_h | 103 #endif // TouchEvent_h |
| OLD | NEW |