<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194170] branches/safari-601-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194170">194170</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-16 13:24:43 -0800 (Wed, 16 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/191080">r191080</a>. rdar://problem/23810432</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageEventHandlercpp">branches/safari-601-branch/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageEventHandlerh">branches/safari-601-branch/Source/WebCore/page/EventHandler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194169 => 194170)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-16 20:29:09 UTC (rev 194169)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-16 21:24:43 UTC (rev 194170)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-16 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r191080.
+
+ 2015-10-14 Tim Horton <timothy_horton@apple.com>
+
+ Move some EventHandler initialization to the header
+ https://bugs.webkit.org/show_bug.cgi?id=150139
+
+ Reviewed by Andreas Kling.
+
+ No new tests, just cleanup.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::EventHandler): Deleted.
+ * page/EventHandler.h:
+ Also found one member which was unused, and a few that were uninitialized.
+ It's likely the uninitialized ones didn't actually cause any trouble because
+ they are reset in lots of places, but this seems better.
+
</ins><span class="cx"> 2015-12-14 Harris Papadopoulos <cpapadopoulos@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192270. rdar://problem/23435543
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/EventHandler.cpp (194169 => 194170)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/EventHandler.cpp 2015-12-16 20:29:09 UTC (rev 194169)
+++ branches/safari-601-branch/Source/WebCore/page/EventHandler.cpp 2015-12-16 21:24:43 UTC (rev 194170)
</span><span class="lines">@@ -368,62 +368,18 @@
</span><span class="cx">
</span><span class="cx"> EventHandler::EventHandler(Frame& frame)
</span><span class="cx"> : m_frame(frame)
</span><del>- , m_mousePressed(false)
- , m_capturesDragging(false)
- , m_mouseDownMayStartSelect(false)
-#if ENABLE(DRAG_SUPPORT)
- , m_mouseDownMayStartDrag(false)
- , m_dragMayStartSelectionInstead(false)
-#endif
- , m_mouseDownWasSingleClickInSelection(false)
- , m_selectionInitiationState(HaveNotStartedSelection)
</del><span class="cx"> , m_hoverTimer(*this, &EventHandler::hoverTimerFired)
</span><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><span class="cx"> , m_cursorUpdateTimer(*this, &EventHandler::cursorUpdateTimerFired)
</span><span class="cx"> #endif
</span><span class="cx"> , m_longMousePressTimer(*this, &EventHandler::recognizeLongMousePress)
</span><del>- , m_didRecognizeLongMousePress(false)
</del><span class="cx"> , m_autoscrollController(std::make_unique<AutoscrollController>())
</span><del>- , m_mouseDownMayStartAutoscroll(false)
- , m_mouseDownWasInSubframe(false)
</del><span class="cx"> #if !ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> , m_fakeMouseMoveEventTimer(*this, &EventHandler::fakeMouseMoveEventTimerFired)
</span><span class="cx"> #endif
</span><del>- , m_svgPan(false)
- , m_resizeLayer(nullptr)
- , m_eventHandlerWillResetCapturingMouseEventsElement(false)
- , m_clickCount(0)
-#if ENABLE(IOS_GESTURE_EVENTS)
- , m_gestureInitialDiameter(GestureUnknown)
- , m_gestureLastDiameter(GestureUnknown)
- , m_gestureInitialRotation(GestureUnknown)
- , m_gestureLastRotation(GestureUnknown)
-#endif
-#if ENABLE(IOS_TOUCH_EVENTS)
- , m_firstTouchID(InvalidTouchIdentifier)
-#endif
- , m_mousePositionIsUnknown(true)
- , m_mouseDownTimestamp(0)
-#if PLATFORM(COCOA)
- , m_mouseDownView(nil)
- , m_sendingEventToSubview(false)
-#if !PLATFORM(IOS)
- , m_activationEventNumber(-1)
-#endif // !PLATFORM(IOS)
-#endif
-#if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
- , m_originatingTouchPointTargetKey(0)
- , m_touchPressed(false)
-#endif
- , m_maxMouseMovedDuration(0)
- , m_baseEventType(PlatformEvent::NoType)
- , m_didStartDrag(false)
- , m_didLongPressInvokeContextMenu(false)
- , m_isHandlingWheelEvent(false)
</del><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> , m_autoHideCursorTimer(*this, &EventHandler::autoHideCursorTimerFired)
</span><span class="cx"> #endif
</span><del>- , m_immediateActionStage(ImmediateActionStage::None)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/EventHandler.h (194169 => 194170)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/EventHandler.h 2015-12-16 20:29:09 UTC (rev 194169)
+++ branches/safari-601-branch/Source/WebCore/page/EventHandler.h 2015-12-16 21:24:43 UTC (rev 194170)
</span><span class="lines">@@ -44,17 +44,15 @@
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+OBJC_CLASS WebEvent;
+OBJC_CLASS WAKView;
</ins><span class="cx"> #ifdef __OBJC__
</span><del>-@class WebEvent;
-@class WAKView;
</del><span class="cx"> #include "WAKAppKitStubs.h"
</span><del>-#else
-class WebEvent;
</del><span class="cx"> #endif
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA) && !defined(__OBJC__)
-class NSView;
</del><ins>+#if PLATFORM(COCOA)
+OBJC_CLASS NSView;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="lines">@@ -261,7 +259,7 @@
</span><span class="cx">
</span><span class="cx"> void focusDocumentView();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void sendScrollEvent(); // Ditto
</del><ins>+ WEBCORE_EXPORT void sendScrollEvent();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) && defined(__OBJC__)
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -470,24 +468,24 @@
</span><span class="cx">
</span><span class="cx"> Frame& m_frame;
</span><span class="cx">
</span><del>- bool m_mousePressed;
- bool m_capturesDragging;
</del><ins>+ bool m_mousePressed { false };
+ bool m_capturesDragging { false };
</ins><span class="cx"> RefPtr<Node> m_mousePressNode;
</span><span class="cx">
</span><del>- bool m_mouseDownMayStartSelect;
</del><ins>+ bool m_mouseDownMayStartSelect { false };
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- bool m_mouseDownMayStartDrag;
- bool m_dragMayStartSelectionInstead;
</del><ins>+ bool m_mouseDownMayStartDrag { false };
+ bool m_dragMayStartSelectionInstead { false };
</ins><span class="cx"> #endif
</span><del>- bool m_mouseDownWasSingleClickInSelection;
</del><ins>+ bool m_mouseDownWasSingleClickInSelection { false };
</ins><span class="cx"> enum SelectionInitiationState { HaveNotStartedSelection, PlacedCaret, ExtendedSelection };
</span><del>- SelectionInitiationState m_selectionInitiationState;
</del><ins>+ SelectionInitiationState m_selectionInitiationState { HaveNotStartedSelection };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> LayoutPoint m_dragStartPos;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool m_panScrollButtonPressed;
</del><ins>+ bool m_panScrollButtonPressed { false };
</ins><span class="cx">
</span><span class="cx"> Timer m_hoverTimer;
</span><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><span class="lines">@@ -495,22 +493,22 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Timer m_longMousePressTimer;
</span><del>- bool m_didRecognizeLongMousePress;
</del><ins>+ bool m_didRecognizeLongMousePress { false };
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<AutoscrollController> m_autoscrollController;
</span><del>- bool m_mouseDownMayStartAutoscroll;
- bool m_mouseDownWasInSubframe;
</del><ins>+ bool m_mouseDownMayStartAutoscroll { false };
+ bool m_mouseDownWasInSubframe { false };
</ins><span class="cx">
</span><span class="cx"> #if !ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> Timer m_fakeMouseMoveEventTimer;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool m_svgPan;
</del><ins>+ bool m_svgPan { false };
</ins><span class="cx">
</span><del>- RenderLayer* m_resizeLayer;
</del><ins>+ RenderLayer* m_resizeLayer { nullptr };
</ins><span class="cx">
</span><span class="cx"> RefPtr<Element> m_capturingMouseEventsElement;
</span><del>- bool m_eventHandlerWillResetCapturingMouseEventsElement;
</del><ins>+ bool m_eventHandlerWillResetCapturingMouseEventsElement { false };
</ins><span class="cx">
</span><span class="cx"> RefPtr<Element> m_elementUnderMouse;
</span><span class="cx"> RefPtr<Element> m_lastElementUnderMouse;
</span><span class="lines">@@ -518,67 +516,66 @@
</span><span class="cx"> WeakPtr<Scrollbar> m_lastScrollbarUnderMouse;
</span><span class="cx"> Cursor m_currentMouseCursor;
</span><span class="cx">
</span><del>- int m_clickCount;
</del><ins>+ int m_clickCount { 0 };
</ins><span class="cx"> RefPtr<Node> m_clickNode;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_GESTURE_EVENTS)
</span><del>- float m_gestureInitialDiameter;
- float m_gestureLastDiameter;
- float m_gestureInitialRotation;
- float m_gestureLastRotation;
</del><ins>+ float m_gestureInitialDiameter { GestureUnknown };
+ float m_gestureInitialRotation { GestureUnknown };
+ float m_gestureLastDiameter { GestureUnknown };
+ float m_gestureLastRotation { GestureUnknown };
+ EventTargetSet m_gestureTargets;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><del>- unsigned m_firstTouchID;
</del><ins>+ unsigned m_firstTouchID { InvalidTouchIdentifier };
</ins><span class="cx">
</span><span class="cx"> TouchArray m_touches;
</span><del>- EventTargetSet m_gestureTargets;
</del><span class="cx"> RefPtr<Frame> m_touchEventTargetSubframe;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> RefPtr<Element> m_dragTarget;
</span><del>- bool m_shouldOnlyFireDragOverEvent;
</del><ins>+ bool m_shouldOnlyFireDragOverEvent { false };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RefPtr<HTMLFrameSetElement> m_frameSetBeingResized;
</span><span class="cx">
</span><span class="cx"> LayoutSize m_offsetFromResizeCorner; // In the coords of m_resizeLayer.
</span><span class="cx">
</span><del>- bool m_mousePositionIsUnknown;
</del><ins>+ bool m_mousePositionIsUnknown { true };
</ins><span class="cx"> IntPoint m_lastKnownMousePosition;
</span><span class="cx"> IntPoint m_lastKnownMouseGlobalPosition;
</span><span class="cx"> IntPoint m_mouseDownPos; // In our view's coords.
</span><del>- double m_mouseDownTimestamp;
</del><ins>+ double m_mouseDownTimestamp { 0 };
</ins><span class="cx"> PlatformMouseEvent m_mouseDown;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- NSView *m_mouseDownView;
- bool m_sendingEventToSubview;
- bool m_startedGestureAtScrollLimit;
</del><ins>+ NSView *m_mouseDownView { nullptr };
+ bool m_sendingEventToSubview { false };
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><del>- int m_activationEventNumber;
</del><ins>+ int m_activationEventNumber { -1 };
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> typedef HashMap<int, RefPtr<EventTarget>> TouchTargetMap;
</span><span class="cx"> TouchTargetMap m_originatingTouchPointTargets;
</span><span class="cx"> RefPtr<Document> m_originatingTouchPointDocument;
</span><del>- unsigned m_originatingTouchPointTargetKey;
- bool m_touchPressed;
</del><ins>+ unsigned m_originatingTouchPointTargetKey { 0 };
+ bool m_touchPressed { false };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- double m_maxMouseMovedDuration;
- PlatformEvent::Type m_baseEventType;
- bool m_didStartDrag;
- bool m_didLongPressInvokeContextMenu;
- bool m_isHandlingWheelEvent;
</del><ins>+ double m_maxMouseMovedDuration { 0 };
+ PlatformEvent::Type m_baseEventType { PlatformEvent::NoType };
+ bool m_didStartDrag { false };
+ bool m_didLongPressInvokeContextMenu { false };
+ bool m_isHandlingWheelEvent { false };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> Timer m_autoHideCursorTimer;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- ImmediateActionStage m_immediateActionStage;
</del><ins>+ ImmediateActionStage m_immediateActionStage { ImmediateActionStage::None };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>