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

Unified Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 2163893003: Start sending auxclick instead of click for non-primary buttons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing auxclick polyfill for remote devtools Created 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/input/EventHandler.cpp
diff --git a/third_party/WebKit/Source/core/input/EventHandler.cpp b/third_party/WebKit/Source/core/input/EventHandler.cpp
index 0d12edaba07fdd4422f52c88d0470b388c743200..69ea301be75d9697b8bbe72cc4ef1c08d61ded12 100644
--- a/third_party/WebKit/Source/core/input/EventHandler.cpp
+++ b/third_party/WebKit/Source/core/input/EventHandler.cpp
@@ -1150,16 +1150,18 @@ WebInputEventResult EventHandler::handleMouseReleaseEvent(const PlatformMouseEve
WebInputEventResult eventResult = updatePointerTargetAndDispatchEvents(EventTypeNames::mouseup, mev.innerNode(), m_clickCount, mev.event());
- bool contextMenuEvent = mouseEvent.button() == RightButton;
+ // We only prevent click event when the click may cause contextmenu to popup.
+ // However, we always send auxclick.
+ bool macContextMenuEvent = false;
#if OS(MACOSX)
// FIXME: The Mac port achieves the same behavior by checking whether the context menu is currently open in WebPage::mouseEvent(). Consider merging the implementations.
if (mouseEvent.button() == LeftButton && mouseEvent.getModifiers() & PlatformEvent::CtrlKey)
- contextMenuEvent = true;
+ macContextMenuEvent = true;
#endif
WebInputEventResult clickEventResult = WebInputEventResult::NotHandled;
const bool shouldDispatchClickEvent = m_clickCount > 0
- && !contextMenuEvent
+ && !macContextMenuEvent
&& mev.innerNode() && m_clickNode
&& mev.innerNode()->canParticipateInFlatTree() && m_clickNode->canParticipateInFlatTree()
&& !(selectionController().hasExtendedSelection() && isLinkSelection(mev));
@@ -1183,7 +1185,10 @@ WebInputEventResult EventHandler::handleMouseReleaseEvent(const PlatformMouseEve
// correctly. Moreover, clickTargetNode is different from
// mev.innerNode at drag-release.
clickEventResult = toWebInputEventResult(clickTargetNode->dispatchMouseEvent(mev.event(),
- EventTypeNames::click, m_clickCount));
+ !RuntimeEnabledFeatures::auxclickEnabled() || (mev.event().button() == MouseButton::LeftButton)
+ ? EventTypeNames::click
+ : EventTypeNames::auxclick,
Dan Beam 2016/08/09 02:04:34 so this guarantees there'll always be either 'clic
Navid Zolghadr 2016/08/09 13:34:46 That is correct. After this change for the primary
+ m_clickCount));
}
}

Powered by Google App Engine
This is Rietveld 408576698