content/browser/web_contents/web_drag_dest_mac.mm - Issue 878413003: Support buttons attribute for drag event (chromium side).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_drag_dest_mac.mm

Issue 878413003: Support buttons attribute for drag event (chromium side). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: win Created 5 years, 10 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

« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | content/shell/renderer/test_runner/event_sender.h » ('j') | ui/views/widget/desktop_aura/desktop_drop_target_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_drag_dest_mac.mm

diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm

index 0e57d4fffdee46ca083f189ca7a90f08e91da6ae..764ff6b0e85fa554f93b2c317dce467ffa8fcba6 100644

--- a/content/browser/web_contents/web_drag_dest_mac.mm

+++ b/content/browser/web_contents/web_drag_dest_mac.mm

@@ -35,6 +35,19 @@ int GetModifierFlags() {

modifier_state |= blink::WebInputEvent::AltKey;

if (currentModifiers & ::cmdKey)

modifier_state |= blink::WebInputEvent::MetaKey;

+ // The return value of 1 << 0 corresponds to the left mouse button,

+ // 1 << 1 corresponds to the right mouse button,

+ // 1 << n, n >= 2 correspond to other mouse buttons.

+ NSUInteger pressedButtons = [NSEvent pressedMouseButtons];

+ if (pressedButtons & (1 << 0))

+ modifier_state |= blink::WebInputEvent::LeftButtonDown;

+ if (pressedButtons & (1 << 1))

+ modifier_state |= blink::WebInputEvent::RightButtonDown;

+ if (pressedButtons & (1 << 2))

+ modifier_state |= blink::WebInputEvent::MiddleButtonDown;

return modifier_state;

}