OLD | NEW |
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 3643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3654 static_cast<DragOperation>(m_operationsAllowed)); | 3654 static_cast<DragOperation>(m_operationsAllowed)); |
3655 | 3655 |
3656 m_page->dragController().dragExited(&dragData); | 3656 m_page->dragController().dragExited(&dragData); |
3657 | 3657 |
3658 // FIXME: why is the drag scroll timer not stopped here? | 3658 // FIXME: why is the drag scroll timer not stopped here? |
3659 | 3659 |
3660 m_dragOperation = WebDragOperationNone; | 3660 m_dragOperation = WebDragOperationNone; |
3661 m_currentDragData = nullptr; | 3661 m_currentDragData = nullptr; |
3662 } | 3662 } |
3663 | 3663 |
3664 void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint, | 3664 void WebViewImpl::dragTargetDrop(const WebDragData& webDragData, const WebPoint&
clientPoint, |
3665 const WebPoint& screenPoint, | 3665 const WebPoint& screenPoint, |
3666 int modifiers) | 3666 int modifiers) |
3667 { | 3667 { |
3668 DCHECK(m_currentDragData); | 3668 DCHECK(m_currentDragData); |
| 3669 m_currentDragData = DataObject::create(webDragData); |
3669 | 3670 |
3670 WebAutofillClient* autofillClient = mainFrameImpl() ? mainFrameImpl()->autof
illClient() : 0; | 3671 WebAutofillClient* autofillClient = mainFrameImpl() ? mainFrameImpl()->autof
illClient() : 0; |
3671 UserGestureNotifier notifier(autofillClient, &m_userGestureObserved); | 3672 UserGestureNotifier notifier(autofillClient, &m_userGestureObserved); |
3672 | 3673 |
3673 // If this webview transitions from the "drop accepting" state to the "not | 3674 // If this webview transitions from the "drop accepting" state to the "not |
3674 // accepting" state, then our IPC message reply indicating that may be in- | 3675 // accepting" state, then our IPC message reply indicating that may be in- |
3675 // flight, or else delayed by javascript processing in this webview. If a | 3676 // flight, or else delayed by javascript processing in this webview. If a |
3676 // drop happens before our IPC reply has reached the browser process, then | 3677 // drop happens before our IPC reply has reached the browser process, then |
3677 // the browser forwards the drop to this webview. So only allow a drop to | 3678 // the browser forwards the drop to this webview. So only allow a drop to |
3678 // proceed if our webview m_dragOperation state is not DragOperationNone. | 3679 // proceed if our webview m_dragOperation state is not DragOperationNone. |
(...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4595 { | 4596 { |
4596 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4597 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
4597 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4598 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
4598 if (!page()) | 4599 if (!page()) |
4599 return 1; | 4600 return 1; |
4600 | 4601 |
4601 return page()->deviceScaleFactor(); | 4602 return page()->deviceScaleFactor(); |
4602 } | 4603 } |
4603 | 4604 |
4604 } // namespace blink | 4605 } // namespace blink |
OLD | NEW |