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 3612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3623 static_cast<DragOperation>(m_operationsAllowed)); | 3623 static_cast<DragOperation>(m_operationsAllowed)); |
3624 | 3624 |
3625 m_page->dragController().dragExited(&dragData); | 3625 m_page->dragController().dragExited(&dragData); |
3626 | 3626 |
3627 // FIXME: why is the drag scroll timer not stopped here? | 3627 // FIXME: why is the drag scroll timer not stopped here? |
3628 | 3628 |
3629 m_dragOperation = WebDragOperationNone; | 3629 m_dragOperation = WebDragOperationNone; |
3630 m_currentDragData = nullptr; | 3630 m_currentDragData = nullptr; |
3631 } | 3631 } |
3632 | 3632 |
3633 void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint, | 3633 void WebViewImpl::dragTargetDrop(const WebDragData& webDragData, const WebPoint&
clientPoint, |
3634 const WebPoint& screenPoint, | 3634 const WebPoint& screenPoint, |
3635 int modifiers) | 3635 int modifiers) |
3636 { | 3636 { |
3637 ASSERT(m_currentDragData); | 3637 ASSERT(m_currentDragData); |
| 3638 m_currentDragData = DataObject::create(webDragData); |
3638 | 3639 |
3639 WebAutofillClient* autofillClient = mainFrameImpl() ? mainFrameImpl()->autof
illClient() : 0; | 3640 WebAutofillClient* autofillClient = mainFrameImpl() ? mainFrameImpl()->autof
illClient() : 0; |
3640 UserGestureNotifier notifier(autofillClient, &m_userGestureObserved); | 3641 UserGestureNotifier notifier(autofillClient, &m_userGestureObserved); |
3641 | 3642 |
3642 // If this webview transitions from the "drop accepting" state to the "not | 3643 // If this webview transitions from the "drop accepting" state to the "not |
3643 // accepting" state, then our IPC message reply indicating that may be in- | 3644 // accepting" state, then our IPC message reply indicating that may be in- |
3644 // flight, or else delayed by javascript processing in this webview. If a | 3645 // flight, or else delayed by javascript processing in this webview. If a |
3645 // drop happens before our IPC reply has reached the browser process, then | 3646 // drop happens before our IPC reply has reached the browser process, then |
3646 // the browser forwards the drop to this webview. So only allow a drop to | 3647 // the browser forwards the drop to this webview. So only allow a drop to |
3647 // proceed if our webview m_dragOperation state is not DragOperationNone. | 3648 // proceed if our webview m_dragOperation state is not DragOperationNone. |
(...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4564 { | 4565 { |
4565 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4566 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
4566 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4567 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
4567 if (!page()) | 4568 if (!page()) |
4568 return 1; | 4569 return 1; |
4569 | 4570 |
4570 return page()->deviceScaleFactor(); | 4571 return page()->deviceScaleFactor(); |
4571 } | 4572 } |
4572 | 4573 |
4573 } // namespace blink | 4574 } // namespace blink |
OLD | NEW |