Changeset 83354 in webkit
- Timestamp:
- Apr 8, 2011 4:00:32 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r83350 r83354 1 2011-04-08 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Adam Roben. 4 5 Make the drag operations be different functions 6 https://bugs.webkit.org/show_bug.cgi?id=58169 7 8 Since we want performDrag to take a sandbox extension, separate the four 9 drag operations out into different functions. No functionality change. 10 11 * UIProcess/API/mac/WKView.mm: 12 (-[WKView draggingEntered:]): 13 (-[WKView draggingUpdated:]): 14 (-[WKView draggingExited:]): 15 (-[WKView performDragOperation:]): 16 * UIProcess/WebPageProxy.cpp: 17 (WebKit::WebPageProxy::dragEntered): 18 (WebKit::WebPageProxy::dragUpdated): 19 (WebKit::WebPageProxy::dragExited): 20 (WebKit::WebPageProxy::performDrag): 21 * UIProcess/WebPageProxy.h: 22 * UIProcess/win/WebView.cpp: 23 (WebKit::WebView::DragEnter): 24 (WebKit::WebView::DragOver): 25 (WebKit::WebView::DragLeave): 26 (WebKit::WebView::Drop): 27 1 28 2011-04-08 Anders Carlsson <andersca@apple.com> 2 29 -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r83326 r83354 1437 1437 1438 1438 _data->_page->resetDragOperation(); 1439 _data->_page-> performDragControllerAction(DragControllerActionEntered,&dragData, [[draggingInfo draggingPasteboard] name]);1439 _data->_page->dragEntered(&dragData, [[draggingInfo draggingPasteboard] name]); 1440 1440 return NSDragOperationCopy; 1441 1441 } … … 1446 1446 IntPoint global(globalPoint([draggingInfo draggingLocation], [self window])); 1447 1447 DragData dragData(draggingInfo, client, global, static_cast<DragOperation>([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo]); 1448 _data->_page-> performDragControllerAction(DragControllerActionUpdated,&dragData, [[draggingInfo draggingPasteboard] name]);1448 _data->_page->dragUpdated(&dragData, [[draggingInfo draggingPasteboard] name]); 1449 1449 return _data->_page->dragOperation(); 1450 1450 } … … 1455 1455 IntPoint global(globalPoint([draggingInfo draggingLocation], [self window])); 1456 1456 DragData dragData(draggingInfo, client, global, static_cast<DragOperation>([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo]); 1457 _data->_page-> performDragControllerAction(DragControllerActionExited,&dragData, [[draggingInfo draggingPasteboard] name]);1457 _data->_page->dragExited(&dragData, [[draggingInfo draggingPasteboard] name]); 1458 1458 _data->_page->resetDragOperation(); 1459 1459 } … … 1469 1469 IntPoint global(globalPoint([draggingInfo draggingLocation], [self window])); 1470 1470 DragData dragData(draggingInfo, client, global, static_cast<DragOperation>([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo]); 1471 _data->_page->performDrag ControllerAction(DragControllerActionPerformDrag,&dragData, [[draggingInfo draggingPasteboard] name]);1471 _data->_page->performDrag(&dragData, [[draggingInfo draggingPasteboard] name]); 1472 1472 return YES; 1473 1473 } -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r83232 r83354 699 699 #endif 700 700 701 void WebPageProxy::dragEntered(WebCore::DragData* dragData, const String& dragStorageName) 702 { 703 performDragControllerAction(DragControllerActionEntered, dragData, dragStorageName); 704 } 705 706 void WebPageProxy::dragUpdated(WebCore::DragData* dragData, const String& dragStorageName) 707 { 708 performDragControllerAction(DragControllerActionUpdated, dragData, dragStorageName); 709 } 710 711 void WebPageProxy::dragExited(WebCore::DragData* dragData, const String& dragStorageName) 712 { 713 performDragControllerAction(DragControllerActionExited, dragData, dragStorageName); 714 } 715 716 void WebPageProxy::performDrag(WebCore::DragData* dragData, const String& dragStorageName) 717 { 718 performDragControllerAction(DragControllerActionPerformDrag, dragData, dragStorageName); 719 } 720 701 721 void WebPageProxy::performDragControllerAction(DragControllerAction action, WebCore::DragData* dragData, const String& dragStorageName) 702 722 { -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r83232 r83354 382 382 383 383 // Drag and drop support. 384 void performDragControllerAction(DragControllerAction, WebCore::DragData*, const String& = String()); 384 void dragEntered(WebCore::DragData*, const String& dragStorageName = String()); 385 void dragUpdated(WebCore::DragData*, const String& dragStorageName = String()); 386 void dragExited(WebCore::DragData*, const String& dragStorageName = String()); 387 void performDrag(WebCore::DragData*, const String& dragStorageName = String()); 388 385 389 void didPerformDragControllerAction(uint64_t resultOperation); 386 390 void dragEnded(const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t operation); … … 693 697 void clearLoadDependentCallbacks(); 694 698 699 void performDragControllerAction(DragControllerAction, WebCore::DragData*, const String& dragStorageName); 700 695 701 PageClient* m_pageClient; 696 702 WebLoaderClient m_loaderClient; -
trunk/Source/WebKit2/UIProcess/win/WebView.cpp
r83229 r83354 1558 1558 ::ScreenToClient(m_window, (LPPOINT)&localpt); 1559 1559 DragData data(pDataObject, IntPoint(localpt.x, localpt.y), IntPoint(pt.x, pt.y), keyStateToDragOperation(grfKeyState)); 1560 m_page-> performDragControllerAction(DragControllerActionEntered,&data);1560 m_page->dragEntered(&data); 1561 1561 *pdwEffect = dragOperationToDragCursor(m_page->dragOperation()); 1562 1562 … … 1576 1576 ::ScreenToClient(m_window, (LPPOINT)&localpt); 1577 1577 DragData data(m_dragData.get(), IntPoint(localpt.x, localpt.y), IntPoint(pt.x, pt.y), keyStateToDragOperation(grfKeyState)); 1578 m_page-> performDragControllerAction(DragControllerActionUpdated,&data);1578 m_page->dragUpdated(&data); 1579 1579 *pdwEffect = dragOperationToDragCursor(m_page->dragOperation()); 1580 1580 } else … … 1592 1592 if (m_dragData) { 1593 1593 DragData data(m_dragData.get(), IntPoint(), IntPoint(), DragOperationNone); 1594 m_page-> performDragControllerAction(DragControllerActionExited,&data);1594 m_page->dragExited(&data); 1595 1595 m_dragData = 0; 1596 1596 m_page->resetDragOperation(); … … 1609 1609 ::ScreenToClient(m_window, (LPPOINT)&localpt); 1610 1610 DragData data(pDataObject, IntPoint(localpt.x, localpt.y), IntPoint(pt.x, pt.y), keyStateToDragOperation(grfKeyState)); 1611 m_page->performDrag ControllerAction(DragControllerActionPerformDrag,&data);1611 m_page->performDrag(&data); 1612 1612 return S_OK; 1613 1613 }
Note: See TracChangeset
for help on using the changeset viewer.