[oilpan] Move EventHandler to the heap

Source/core/page/EventHandler.h

 /*
  * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 69 matching lines @@
 struct DragState;
 
 extern const int LinkDragHysteresis;
 extern const int ImageDragHysteresis;
 extern const int TextDragHysteresis;
 extern const int GeneralDragHysteresis;
 
 enum AppendTrailingWhitespace { ShouldAppendTrailingWhitespace, DontAppendTrailingWhitespace };
 enum CheckDragHysteresis { ShouldCheckDragHysteresis, DontCheckDragHysteresis };
 
-class EventHandler {
-    WTF_MAKE_NONCOPYABLE(EventHandler);
+class EventHandler : public HeapAllocatedFinalized<EventHandler> {
+    DECLARE_GC_MAP
+    DEFINE_SELF_HANDLE(EventHandler)
+    WTF_MAKE_NONCOPYABLE(EventHandler)
 public:
-    explicit EventHandler(Frame*);
+    static RESULT(EventHandler) create(Frame* frame)
+    {
+        return adopt(new EventHandler(frame));
+    }
+
     ~EventHandler();
 
     void clear();
     void nodeWillBeRemoved(HANDLE_FORMAL(Node));
 
     void updateSelectionForMouseDrag();
 
     RESULT(Node) mousePressNode() const;
     void setMousePressNode(HANDLE_FORMAL(Node));
 
@@ skipping 97 matching lines @@
 
     void capsLockStateMayHaveChanged(); // Only called by FrameSelection
 
     void sendResizeEvent(); // Only called in FrameView
     void sendScrollEvent(); // Ditto
 
     bool handleTouchEvent(const PlatformTouchEvent&);
 
     bool useHandCursor(HANDLE_FORMAL(Node), bool isOverLink, bool shiftKey);
 
+    void accept(Visitor*) const;
+
 private:
+    explicit EventHandler(Frame*);
+
     static DragState& dragState();
     static const double TextDragDelay;
     
     PassRefPtr<Clipboard> createDraggingClipboard() const;
 
     bool eventActivatedView(const PlatformMouseEvent&) const;
     bool updateSelectionForMouseDownDispatchingSelectStart(HANDLE_FORMAL(Node), const VisibleSelection&, TextGranularity);
     void selectClosestWordFromHitTestResult(const HitTestResult&, AppendTrailingWhitespace);
     void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&);
     void selectClosestWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults&);
@@ skipping 89 matching lines @@
 #if ENABLE(CURSOR_VISIBILITY)
     void startAutoHideCursorTimer();
     void cancelAutoHideCursorTimer();
     void autoHideCursorTimerFired(Timer<EventHandler>*);
 #endif
 
     Frame* m_frame;
 
     bool m_mousePressed;
     bool m_capturesDragging;
-    ANNOTATED_FIELD(Persistent<Node>, m_mousePressNode);
+    Member<Node> m_mousePressNode;
 
     bool m_mouseDownMayStartSelect;
     bool m_mouseDownMayStartDrag;
     bool m_dragMayStartSelectionInstead;
     bool m_mouseDownWasSingleClickInSelection;
     enum SelectionInitiationState { HaveNotStartedSelection, PlacedCaret, ExtendedSelection };
     SelectionInitiationState m_selectionInitiationState;
 
     LayoutPoint m_dragStartPos;
 
     bool m_panScrollButtonPressed;
 
     Timer<EventHandler> m_hoverTimer;
 
     OwnPtr<AutoscrollController> m_autoscrollController;
     bool m_mouseDownMayStartAutoscroll;
     bool m_mouseDownWasInSubframe;
 
     Timer<EventHandler> m_fakeMouseMoveEventTimer;
 
 #if ENABLE(SVG)
     bool m_svgPan;
     RefPtr<SVGElementInstance> m_instanceUnderMouse;
     RefPtr<SVGElementInstance> m_lastInstanceUnderMouse;
 #endif
 
     RenderLayer* m_resizeLayer;
 
-    ANNOTATED_FIELD(Persistent<Node>, m_capturingMouseEventsNode);
+    Member<Node> m_capturingMouseEventsNode;
     bool m_eventHandlerWillResetCapturingMouseEventsNode;
     
-    ANNOTATED_FIELD(Persistent<Node>, m_nodeUnderMouse);
-    ANNOTATED_FIELD(Persistent<Node>, m_lastNodeUnderMouse);
+    Member<Node> m_nodeUnderMouse;
+    Member<Node> m_lastNodeUnderMouse;
     RefPtr<Frame> m_lastMouseMoveEventSubframe;
     RefPtr<Scrollbar> m_lastScrollbarUnderMouse;
     Cursor m_currentMouseCursor;
 
     int m_clickCount;
-    ANNOTATED_FIELD(Persistent<Node>, m_clickNode);
+    Member<Node> m_clickNode;
 
-    ANNOTATED_FIELD(Persistent<Node>, m_dragTarget);
+    Member<Node> m_dragTarget;
     bool m_shouldOnlyFireDragOverEvent;
     
-    ANNOTATED_FIELD(Persistent<HTMLFrameSetElement>, m_frameSetBeingResized);
+    Member<HTMLFrameSetElement> m_frameSetBeingResized;
 
     LayoutSize m_offsetFromResizeCorner; // In the coords of m_resizeLayer.
     
     bool m_mousePositionIsUnknown;
     IntPoint m_lastKnownMousePosition;
     IntPoint m_lastKnownMouseGlobalPosition;
     IntPoint m_mouseDownPos; // In our view's coords.
     double m_mouseDownTimestamp;
     PlatformMouseEvent m_mouseDown;
     RefPtr<UserGestureToken> m_lastMouseDownUserGestureToken;
 
-    ANNOTATED_FIELD(Persistent<Node>, m_latchedWheelEventNode);
+    Member<Node> m_latchedWheelEventNode;
     bool m_widgetIsLatched;
 
-    ANNOTATED_FIELD(Persistent<Node>, m_previousWheelScrolledNode);
+    Member<Node> m_previousWheelScrolledNode;
 
     typedef CollectionRoot<HashMap<int, Member<EventTarget> > > TouchTargetMap;

[haraken, 2013/11/11 12:41:35]

oh, I forgot to remove this CollectionRoot. Just a second.

[haraken, 2013/11/11 12:45:29]

Done.

     ANNOTATED_FIELD(TouchTargetMap, m_originatingTouchPointTargets);
-    ANNOTATED_FIELD(Persistent<Document>, m_originatingTouchPointDocument);
+    Member<Document> m_originatingTouchPointDocument;
     unsigned m_originatingTouchPointTargetKey;
     bool m_touchPressed;
 
-    ANNOTATED_FIELD(Persistent<Node>, m_scrollGestureHandlingNode);
+    Member<Node> m_scrollGestureHandlingNode;
     bool m_lastHitTestResultOverWidget;
-    ANNOTATED_FIELD(Persistent<Node>, m_previousGestureScrolledNode);
+    Member<Node> m_previousGestureScrolledNode;
     RefPtr<Scrollbar> m_scrollbarHandlingScrollGesture;
 
     double m_maxMouseMovedDuration;
     PlatformEvent::Type m_baseEventType;
     bool m_didStartDrag;
     bool m_didLongPressInvokeContextMenu;
 
 #if ENABLE(CURSOR_VISIBILITY)
     Timer<EventHandler> m_autoHideCursorTimer;
 #endif
 };
 
 } // namespace WebCore
 
 #endif // EventHandler_h