Support buttons attribute for drag event (blink side).

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 219 matching lines @@
 STATIC_ASSERT_MATCHING_ENUM(DragOperationCopy);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationLink);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationGeneric);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationPrivate);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationMove);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationDelete);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationEvery);
 
 static bool shouldUseExternalPopupMenus = false;
 
-static int webInputEventKeyStateToPlatformEventKeyState(int webInputEventKeyState)
-{
-    int platformEventKeyState = 0;
-    if (webInputEventKeyState & WebInputEvent::ShiftKey)
-        platformEventKeyState = platformEventKeyState | PlatformEvent::ShiftKey;
-    if (webInputEventKeyState & WebInputEvent::ControlKey)
-        platformEventKeyState = platformEventKeyState | PlatformEvent::CtrlKey;
-    if (webInputEventKeyState & WebInputEvent::AltKey)
-        platformEventKeyState = platformEventKeyState | PlatformEvent::AltKey;
-    if (webInputEventKeyState & WebInputEvent::MetaKey)
-        platformEventKeyState = platformEventKeyState | PlatformEvent::MetaKey;
-    return platformEventKeyState;
-}
-
 namespace {
 
 class UserGestureNotifier {
 public:
     // If a UserGestureIndicator is created for a user gesture since the last
     // page load and *userGestureObserved is false, the UserGestureNotifier
     // will notify the client and set *userGestureObserved to true.
     UserGestureNotifier(WebAutofillClient*, bool* userGestureObserved);
     ~UserGestureNotifier();
 
@@ skipping 3368 matching lines @@
         m_page->dragController().dragEnded();
         m_doingDragAndDrop = false;
     }
 }
 
 WebDragOperation WebViewImpl::dragTargetDragEnter(
     const WebDragData& webDragData,
     const WebPoint& clientPoint,
     const WebPoint& screenPoint,
     WebDragOperationsMask operationsAllowed,
-    int keyModifiers)
+    int modifiers)
 {
     ASSERT(!m_currentDragData);
 
     m_currentDragData = DataObject::create(webDragData);
     m_operationsAllowed = operationsAllowed;
 
-    return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyModifiers);
+    return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, modifiers);
 }
 
 WebDragOperation WebViewImpl::dragTargetDragOver(
     const WebPoint& clientPoint,
     const WebPoint& screenPoint,
     WebDragOperationsMask operationsAllowed,
-    int keyModifiers)
+    int modifiers)
 {
     m_operationsAllowed = operationsAllowed;
 
-    return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragOver, keyModifiers);
+    return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragOver, modifiers);
 }
 
 void WebViewImpl::dragTargetDragLeave()
 {
     ASSERT(m_currentDragData);
 
     DragData dragData(
         m_currentDragData.get(),
         IntPoint(),
         IntPoint(),
         static_cast<DragOperation>(m_operationsAllowed));
 
     m_page->dragController().dragExited(&dragData);
 
     // FIXME: why is the drag scroll timer not stopped here?
 
     m_dragOperation = WebDragOperationNone;
     m_currentDragData = nullptr;
 }
 
 void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint,
                                  const WebPoint& screenPoint,
-                                 int keyModifiers)
+                                 int modifiers)
 {
     ASSERT(m_currentDragData);
 
     WebAutofillClient* autofillClient = mainFrameImpl() ? mainFrameImpl()->autofillClient() : 0;
     UserGestureNotifier notifier(autofillClient, &m_userGestureObserved);
 
     // If this webview transitions from the "drop accepting" state to the "not
     // accepting" state, then our IPC message reply indicating that may be in-
     // flight, or else delayed by javascript processing in this webview.  If a
     // drop happens before our IPC reply has reached the browser process, then
     // the browser forwards the drop to this webview.  So only allow a drop to
     // proceed if our webview m_dragOperation state is not DragOperationNone.
 
     if (m_dragOperation == WebDragOperationNone) { // IPC RACE CONDITION: do not allow this drop.
         dragTargetDragLeave();
         return;
     }
 
-    m_currentDragData->setModifierKeyState(webInputEventKeyStateToPlatformEventKeyState(keyModifiers));
+    m_currentDragData->setModifiers(toPlatformMouseEventModifiers(modifiers));
     DragData dragData(
         m_currentDragData.get(),
         clientPoint,
         screenPoint,
         static_cast<DragOperation>(m_operationsAllowed));
 
     UserGestureIndicator gesture(DefinitelyProcessingNewUserGesture);
     m_page->dragController().performDrag(&dragData);
 
     m_dragOperation = WebDragOperationNone;
@@ skipping 17 matching lines @@
 {
     Vector<String> convertedWords;
     convertedWords.append(words.data(), words.size());
 
     for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->isLocalFrame())
             toLocalFrame(frame)->removeSpellingMarkersUnderWords(convertedWords);
     }
 }
 
-WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPoint, const WebPoint& screenPoint, DragAction dragAction, int keyModifiers)
+WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPoint, const WebPoint& screenPoint, DragAction dragAction, int modifiers)
 {
     ASSERT(m_currentDragData);
 
-    m_currentDragData->setModifierKeyState(webInputEventKeyStateToPlatformEventKeyState(keyModifiers));
+    m_currentDragData->setModifiers(toPlatformMouseEventModifiers(modifiers));
     DragData dragData(
         m_currentDragData.get(),
         clientPoint,
         screenPoint,
         static_cast<DragOperation>(m_operationsAllowed));
 
     DragSession dragSession;
     if (dragAction == DragEnter)
         dragSession = m_page->dragController().dragEntered(&dragData);
     else
@@ skipping 911 matching lines @@
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 void WebViewImpl::forceNextWebGLContextCreationToFail()
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 } // namespace blink