| Index: third_party/WebKit/Source/core/events/WheelEvent.cpp
|
| diff --git a/third_party/WebKit/Source/core/events/WheelEvent.cpp b/third_party/WebKit/Source/core/events/WheelEvent.cpp
|
| index 3300b8d31911f27a1290ee7b0cf771db40a6e497..010d19bdd9eaee29b000eebaf7c878574dbccc81 100644
|
| --- a/third_party/WebKit/Source/core/events/WheelEvent.cpp
|
| +++ b/third_party/WebKit/Source/core/events/WheelEvent.cpp
|
| @@ -34,9 +34,9 @@ inline static unsigned convertDeltaMode(const PlatformWheelEvent& event)
|
| return event.granularity() == ScrollByPageWheelEvent ? WheelEvent::DOM_DELTA_PAGE : WheelEvent::DOM_DELTA_PIXEL;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<WheelEvent> WheelEvent::create(const PlatformWheelEvent& event, PassRefPtrWillBeRawPtr<AbstractView> view)
|
| +RawPtr<WheelEvent> WheelEvent::create(const PlatformWheelEvent& event, RawPtr<AbstractView> view)
|
| {
|
| - return adoptRefWillBeNoop(new WheelEvent(FloatPoint(event.wheelTicksX(), event.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()),
|
| + return (new WheelEvent(FloatPoint(event.wheelTicksX(), event.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()),
|
| convertDeltaMode(event), view, event.globalPosition(), event.position(),
|
| event.modifiers(),
|
| MouseEvent::platformModifiersToButtons(event.modifiers()), event.timestamp(),
|
| @@ -71,7 +71,7 @@ WheelEvent::WheelEvent(const AtomicString& type, const WheelEventInit& initializ
|
| }
|
|
|
| WheelEvent::WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, unsigned deltaMode,
|
| - PassRefPtrWillBeRawPtr<AbstractView> view, const IntPoint& screenLocation, const IntPoint& windowLocation,
|
| + RawPtr<AbstractView> view, const IntPoint& screenLocation, const IntPoint& windowLocation,
|
| PlatformEvent::Modifiers modifiers, unsigned short buttons, double platformTimeStamp,
|
| bool canScroll, int resendingPluginId, bool hasPreciseScrollingDeltas, RailsMode railsMode)
|
| : MouseEvent(EventTypeNames::wheel, true, true, view, 0, screenLocation.x(), screenLocation.y(),
|
| @@ -104,7 +104,7 @@ bool WheelEvent::isWheelEvent() const
|
| return true;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<EventDispatchMediator> WheelEvent::createMediator()
|
| +RawPtr<EventDispatchMediator> WheelEvent::createMediator()
|
| {
|
| return WheelEventDispatchMediator::create(this);
|
| }
|
| @@ -114,12 +114,12 @@ DEFINE_TRACE(WheelEvent)
|
| MouseEvent::trace(visitor);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<WheelEventDispatchMediator> WheelEventDispatchMediator::create(PassRefPtrWillBeRawPtr<WheelEvent> event)
|
| +RawPtr<WheelEventDispatchMediator> WheelEventDispatchMediator::create(RawPtr<WheelEvent> event)
|
| {
|
| - return adoptRefWillBeNoop(new WheelEventDispatchMediator(event));
|
| + return (new WheelEventDispatchMediator(event));
|
| }
|
|
|
| -WheelEventDispatchMediator::WheelEventDispatchMediator(PassRefPtrWillBeRawPtr<WheelEvent> event)
|
| +WheelEventDispatchMediator::WheelEventDispatchMediator(RawPtr<WheelEvent> event)
|
| : EventDispatchMediator(event)
|
| {
|
| }
|
|
|