Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Side by Side Diff: Source/core/input/EventHandler.h

Issue 1293973004: Removed a redundant mouse-state from EventHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed a raw-ptr issue on deleted node. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/input/EventHandler.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 272
273 void resetOverscroll(bool didScrollX, bool didScrollY); 273 void resetOverscroll(bool didScrollX, bool didScrollY);
274 void handleOverscroll(const ScrollResult&, const FloatPoint& position = Floa tPoint(), const FloatSize& velocity = FloatSize()); 274 void handleOverscroll(const ScrollResult&, const FloatPoint& position = Floa tPoint(), const FloatSize& velocity = FloatSize());
275 275
276 void customizedScroll(const Node& startNode, ScrollState&); 276 void customizedScroll(const Node& startNode, ScrollState&);
277 277
278 HitTestResult hitTestResultInFrame(LocalFrame*, const LayoutPoint&, HitTestR equest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest:: Active); 278 HitTestResult hitTestResultInFrame(LocalFrame*, const LayoutPoint&, HitTestR equest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest:: Active);
279 279
280 void invalidateClick(); 280 void invalidateClick();
281 281
282 void updateMouseEventTargetNode(Node*, const PlatformMouseEvent&, bool); 282 void updateMouseEventTargetNode(Node*, const PlatformMouseEvent&);
283 283
284 /* Dispatches mouseover, mouseout, mouseenter and mouseleave events to appro priate nodes when the mouse pointer moves from one node to another. */ 284 /* Dispatches mouseover, mouseout, mouseenter and mouseleave events to appro priate nodes when the mouse pointer moves from one node to another. */
285 void sendMouseEventsForNodeTransition(Node*, Node*, const PlatformMouseEvent &); 285 void sendMouseEventsForNodeTransition(Node*, Node*, const PlatformMouseEvent &);
286 286
287 MouseEventWithHitTestResults prepareMouseEvent(const HitTestRequest&, const PlatformMouseEvent&); 287 MouseEventWithHitTestResults prepareMouseEvent(const HitTestRequest&, const PlatformMouseEvent&);
288 288
289 bool dispatchMouseEvent(const AtomicString& eventType, Node* target, int cli ckCount, const PlatformMouseEvent&, bool setUnder); 289 bool dispatchMouseEvent(const AtomicString& eventType, Node* target, int cli ckCount, const PlatformMouseEvent&);
290 bool dispatchDragEvent(const AtomicString& eventType, Node* target, const Pl atformMouseEvent&, DataTransfer*); 290 bool dispatchDragEvent(const AtomicString& eventType, Node* target, const Pl atformMouseEvent&, DataTransfer*);
291 291
292 void clearDragDataTransfer(); 292 void clearDragDataTransfer();
293 293
294 bool handleDrag(const MouseEventWithHitTestResults&, DragInitiator); 294 bool handleDrag(const MouseEventWithHitTestResults&, DragInitiator);
295 bool tryStartDrag(const MouseEventWithHitTestResults&); 295 bool tryStartDrag(const MouseEventWithHitTestResults&);
296 void clearDragState(); 296 void clearDragState();
297 297
298 bool dispatchDragSrcEvent(const AtomicString& eventType, const PlatformMouse Event&); 298 bool dispatchDragSrcEvent(const AtomicString& eventType, const PlatformMouse Event&);
299 299
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 Timer<EventHandler> m_fakeMouseMoveEventTimer; 365 Timer<EventHandler> m_fakeMouseMoveEventTimer;
366 366
367 bool m_svgPan; 367 bool m_svgPan;
368 368
369 RawPtrWillBeMember<DeprecatedPaintLayerScrollableArea> m_resizeScrollableAre a; 369 RawPtrWillBeMember<DeprecatedPaintLayerScrollableArea> m_resizeScrollableAre a;
370 370
371 RefPtrWillBeMember<Node> m_capturingMouseEventsNode; 371 RefPtrWillBeMember<Node> m_capturingMouseEventsNode;
372 bool m_eventHandlerWillResetCapturingMouseEventsNode; 372 bool m_eventHandlerWillResetCapturingMouseEventsNode;
373 373
374 RefPtrWillBeMember<Node> m_nodeUnderMouse; 374 RefPtrWillBeMember<Node> m_nodeUnderMouse;
375 RefPtrWillBeMember<Node> m_lastNodeUnderMouse;
376 RefPtrWillBeMember<LocalFrame> m_lastMouseMoveEventSubframe; 375 RefPtrWillBeMember<LocalFrame> m_lastMouseMoveEventSubframe;
377 RefPtrWillBeMember<Scrollbar> m_lastScrollbarUnderMouse; 376 RefPtrWillBeMember<Scrollbar> m_lastScrollbarUnderMouse;
378 377
379 int m_clickCount; 378 int m_clickCount;
380 RefPtrWillBeMember<Node> m_clickNode; 379 RefPtrWillBeMember<Node> m_clickNode;
381 380
382 RefPtrWillBeMember<Node> m_dragTarget; 381 RefPtrWillBeMember<Node> m_dragTarget;
383 bool m_shouldOnlyFireDragOverEvent; 382 bool m_shouldOnlyFireDragOverEvent;
384 383
385 RefPtrWillBeMember<HTMLFrameSetElement> m_frameSetBeingResized; 384 RefPtrWillBeMember<HTMLFrameSetElement> m_frameSetBeingResized;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 // scroll which shouldn't propagate can't cause any element to 440 // scroll which shouldn't propagate can't cause any element to
442 // scroll other than the |m_previousGestureScrolledNode|. 441 // scroll other than the |m_previousGestureScrolledNode|.
443 bool m_deltaConsumedForScrollSequence; 442 bool m_deltaConsumedForScrollSequence;
444 }; 443 };
445 444
446 } // namespace blink 445 } // namespace blink
447 446
448 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::EventHandler::TouchInfo); 447 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::EventHandler::TouchInfo);
449 448
450 #endif // EventHandler_h 449 #endif // EventHandler_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/input/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698