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

Side by Side Diff: Source/core/page/EventHandler.cpp

Issue 453493002: Improve detection of touch events when hiding media controls. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@autoHideControls
Patch Set: Propagate SyntheticEventType to MouseRelatedEvent Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 1852 matching lines...) Expand 10 before | Expand all | Expand 10 after
1863 m_nodeUnderMouse->dispatchMouseEvent(mouseEvent, EventTypeNames: :mouseover, 0, m_lastNodeUnderMouse.get()); 1863 m_nodeUnderMouse->dispatchMouseEvent(mouseEvent, EventTypeNames: :mouseover, 0, m_lastNodeUnderMouse.get());
1864 } 1864 }
1865 m_lastNodeUnderMouse = m_nodeUnderMouse; 1865 m_lastNodeUnderMouse = m_nodeUnderMouse;
1866 } 1866 }
1867 } 1867 }
1868 1868
1869 // The return value means 'continue default handling.' 1869 // The return value means 'continue default handling.'
1870 bool EventHandler::dispatchMouseEvent(const AtomicString& eventType, Node* targe tNode, int clickCount, const PlatformMouseEvent& mouseEvent, bool setUnder) 1870 bool EventHandler::dispatchMouseEvent(const AtomicString& eventType, Node* targe tNode, int clickCount, const PlatformMouseEvent& mouseEvent, bool setUnder)
1871 { 1871 {
1872 updateMouseEventTargetNode(targetNode, mouseEvent, setUnder); 1872 updateMouseEventTargetNode(targetNode, mouseEvent, setUnder);
1873 return !m_nodeUnderMouse || m_nodeUnderMouse->dispatchMouseEvent(mouseEvent, eventType, clickCount); 1873 return !m_nodeUnderMouse || m_nodeUnderMouse->dispatchMouseEvent(mouseEvent, eventType, clickCount, 0);
Rick Byers 2014/08/20 23:32:56 What's this for?
Ignacio Solla 2014/08/21 17:30:14 Left-over from previous patch version.
1874 } 1874 }
1875 1875
1876 // The return value means 'swallow event' (was handled), as for other handle* fu nctions. 1876 // The return value means 'swallow event' (was handled), as for other handle* fu nctions.
1877 bool EventHandler::handleMouseFocus(const PlatformMouseEvent& mouseEvent) 1877 bool EventHandler::handleMouseFocus(const PlatformMouseEvent& mouseEvent)
1878 { 1878 {
1879 // If clicking on a frame scrollbar, do not mess up with content focus. 1879 // If clicking on a frame scrollbar, do not mess up with content focus.
1880 if (FrameView* view = m_frame->view()) { 1880 if (FrameView* view = m_frame->view()) {
1881 if (view->scrollbarAtPoint(mouseEvent.position())) 1881 if (view->scrollbarAtPoint(mouseEvent.position()))
1882 return false; 1882 return false;
1883 } 1883 }
(...skipping 1966 matching lines...) Expand 10 before | Expand all | Expand 10 after
3850 unsigned EventHandler::accessKeyModifiers() 3850 unsigned EventHandler::accessKeyModifiers()
3851 { 3851 {
3852 #if OS(MACOSX) 3852 #if OS(MACOSX)
3853 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 3853 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
3854 #else 3854 #else
3855 return PlatformEvent::AltKey; 3855 return PlatformEvent::AltKey;
3856 #endif 3856 #endif
3857 } 3857 }
3858 3858
3859 } // namespace blink 3859 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698