Add WebDragData to blink::WebView::dragtargetDrop

third_party/WebKit/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 3618 matching lines @@
         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 modifiers)
+void WebViewImpl::dragTargetDrop(const WebDragData& webDragData, const WebPoint& clientPoint,
+    const WebPoint& screenPoint,
+    int modifiers)
 {
     ASSERT(m_currentDragData);
+    if (!webDragData.isNull()) {

[aelias_OOO_until_Jul13, 2016/03/02 00:03:19]

nit: no braces for one-line clauses in Blink style

[hush (inactive), 2016/03/02 02:35:11]

Done.

+        m_currentDragData = DataObject::create(webDragData);
+    }
 
     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.
@@ skipping 915 matching lines @@
 {
     // TODO(oshima): Investigate if this should return the ScreenInfo's scale factor rather than
     // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 } // namespace blink