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

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 1723763002: Add WebDragData to blink::WebView::dragtargetDrop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/public/web/WebView.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 3660 matching lines...) Expand 10 before | Expand all | Expand 10 after
3671 static_cast<DragOperation>(m_operationsAllowed)); 3671 static_cast<DragOperation>(m_operationsAllowed));
3672 3672
3673 m_page->dragController().dragExited(&dragData); 3673 m_page->dragController().dragExited(&dragData);
3674 3674
3675 // FIXME: why is the drag scroll timer not stopped here? 3675 // FIXME: why is the drag scroll timer not stopped here?
3676 3676
3677 m_dragOperation = WebDragOperationNone; 3677 m_dragOperation = WebDragOperationNone;
3678 m_currentDragData = nullptr; 3678 m_currentDragData = nullptr;
3679 } 3679 }
3680 3680
3681 void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint, 3681 void WebViewImpl::dragTargetDrop(const WebDragData& webDragData, const WebPoint& clientPoint,
dcheng 2016/05/04 05:21:34 Nit: const WebDragData& dragData
3682 const WebPoint& screenPoint, 3682 const WebPoint& screenPoint,
3683 int modifiers) 3683 int modifiers)
3684 { 3684 {
3685 DCHECK(m_currentDragData); 3685 DCHECK(m_currentDragData);
3686 m_currentDragData = DataObject::create(webDragData);
3686 3687
3687 WebAutofillClient* autofillClient = mainFrameImpl() ? mainFrameImpl()->autof illClient() : 0; 3688 WebAutofillClient* autofillClient = mainFrameImpl() ? mainFrameImpl()->autof illClient() : 0;
3688 UserGestureNotifier notifier(autofillClient, &m_userGestureObserved); 3689 UserGestureNotifier notifier(autofillClient, &m_userGestureObserved);
3689 3690
3690 // If this webview transitions from the "drop accepting" state to the "not 3691 // If this webview transitions from the "drop accepting" state to the "not
3691 // accepting" state, then our IPC message reply indicating that may be in- 3692 // accepting" state, then our IPC message reply indicating that may be in-
3692 // flight, or else delayed by javascript processing in this webview. If a 3693 // flight, or else delayed by javascript processing in this webview. If a
3693 // drop happens before our IPC reply has reached the browser process, then 3694 // drop happens before our IPC reply has reached the browser process, then
3694 // the browser forwards the drop to this webview. So only allow a drop to 3695 // the browser forwards the drop to this webview. So only allow a drop to
3695 // proceed if our webview m_dragOperation state is not DragOperationNone. 3696 // proceed if our webview m_dragOperation state is not DragOperationNone.
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
4529 { 4530 {
4530 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than 4531 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than
4531 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. 4532 // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
4532 if (!page()) 4533 if (!page())
4533 return 1; 4534 return 1;
4534 4535
4535 return page()->deviceScaleFactor(); 4536 return page()->deviceScaleFactor();
4536 } 4537 }
4537 4538
4538 } // namespace blink 4539 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/public/web/WebView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698