Changeset 122486 in webkit
- Timestamp:
- Jul 12, 2012 11:22:39 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r122485 r122486 1 2012-07-12 Tony Chang <tony@chromium.org> 2 3 [chromium] Remove drag and drop API methods that are no longer used 4 https://bugs.webkit.org/show_bug.cgi?id=90996 5 6 Reviewed by Adam Barth. 7 8 In r117327, we added a parameter for modifier keys to these methods. 9 Chromium has since switched to using the methods that require the 10 extra parameter so we can remove these methods. 11 12 * public/WebView.h: 13 (WebView): 14 * src/WebViewImpl.cpp: 15 (WebKit::WebViewImpl::dragTargetDragEnter): 16 (WebKit::WebViewImpl::dragTargetDragOver): 17 * src/WebViewImpl.h: 18 (WebViewImpl): 19 1 20 2012-07-12 Tony Chang <tony@chromium.org> 2 21 -
trunk/Source/WebKit/chromium/public/WebView.h
r122395 r122486 318 318 // Callback methods when a drag-and-drop operation is trying to drop 319 319 // something on the WebView. 320 // FIXME: Remove this method after chromium changes catch up.321 virtual WebDragOperation dragTargetDragEnter(322 const WebDragData&,323 const WebPoint& clientPoint, const WebPoint& screenPoint,324 WebDragOperationsMask operationsAllowed) = 0;325 320 virtual WebDragOperation dragTargetDragEnter( 326 321 const WebDragData&, … … 328 323 WebDragOperationsMask operationsAllowed, 329 324 int keyModifiers) = 0; 330 // FIXME: Remove this method after chromium changes catch up.331 virtual WebDragOperation dragTargetDragOver(332 const WebPoint& clientPoint, const WebPoint& screenPoint,333 WebDragOperationsMask operationsAllowed) = 0;334 325 virtual WebDragOperation dragTargetDragOver( 335 326 const WebPoint& clientPoint, const WebPoint& screenPoint, … … 337 328 int keyModifiers) = 0; 338 329 virtual void dragTargetDragLeave() = 0; 339 // FIXME: Remove this method after chromium changes catch up.340 virtual void dragTargetDrop(341 const WebPoint& clientPoint, const WebPoint& screenPoint) = 0;342 330 virtual void dragTargetDrop( 343 331 const WebPoint& clientPoint, const WebPoint& screenPoint, -
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
r122395 r122486 2797 2797 const WebPoint& clientPoint, 2798 2798 const WebPoint& screenPoint, 2799 WebDragOperationsMask operationsAllowed)2800 {2801 return dragTargetDragEnter(webDragData, clientPoint, screenPoint, operationsAllowed, 0);2802 }2803 2804 WebDragOperation WebViewImpl::dragTargetDragEnter(2805 const WebDragData& webDragData,2806 const WebPoint& clientPoint,2807 const WebPoint& screenPoint,2808 2799 WebDragOperationsMask operationsAllowed, 2809 2800 int keyModifiers) … … 2815 2806 2816 2807 return dragTargetDragEnterOrOver(clientPoint, screenPoint, DragEnter, keyModifiers); 2817 }2818 2819 WebDragOperation WebViewImpl::dragTargetDragOver(2820 const WebPoint& clientPoint,2821 const WebPoint& screenPoint,2822 WebDragOperationsMask operationsAllowed)2823 {2824 return dragTargetDragOver(clientPoint, screenPoint, operationsAllowed, 0);2825 2808 } 2826 2809 … … 2852 2835 m_dragOperation = WebDragOperationNone; 2853 2836 m_currentDragData = 0; 2854 }2855 2856 void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint,2857 const WebPoint& screenPoint)2858 {2859 dragTargetDrop(clientPoint, screenPoint, 0);2860 2837 } 2861 2838 -
trunk/Source/WebKit/chromium/src/WebViewImpl.h
r122395 r122486 240 240 const WebPoint& clientPoint, 241 241 const WebPoint& screenPoint, 242 WebDragOperationsMask operationsAllowed);243 virtual WebDragOperation dragTargetDragEnter(244 const WebDragData&,245 const WebPoint& clientPoint,246 const WebPoint& screenPoint,247 242 WebDragOperationsMask operationsAllowed, 248 243 int keyModifiers); 249 virtual WebDragOperation dragTargetDragOver(250 const WebPoint& clientPoint,251 const WebPoint& screenPoint,252 WebDragOperationsMask operationsAllowed);253 244 virtual WebDragOperation dragTargetDragOver( 254 245 const WebPoint& clientPoint, … … 257 248 int keyModifiers); 258 249 virtual void dragTargetDragLeave(); 259 virtual void dragTargetDrop(260 const WebPoint& clientPoint,261 const WebPoint& screenPoint);262 250 virtual void dragTargetDrop( 263 251 const WebPoint& clientPoint, -
trunk/Tools/ChangeLog
r122481 r122486 1 2012-07-12 Tony Chang <tony@chromium.org> 2 3 [chromium] Remove drag and drop API methods that are no longer used 4 https://bugs.webkit.org/show_bug.cgi?id=90996 5 6 Reviewed by Adam Barth. 7 8 Migrate DRT to use the methods that take modifier keys. 9 10 * DumpRenderTree/chromium/EventSender.cpp: 11 (EventSender::doDragDrop): 12 (EventSender::doMouseUp): 13 (EventSender::doMouseMove): 14 (EventSender::beginDragWithFiles): 15 1 16 2012-07-12 Ojan Vafai <ojan@chromium.org> 2 17 -
trunk/Tools/DumpRenderTree/chromium/EventSender.cpp
r122399 r122486 352 352 currentDragData = dragData; 353 353 currentDragEffectsAllowed = mask; 354 currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed );354 currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed, 0); 355 355 356 356 // Finish processing events. … … 467 467 WebPoint screenPoint(e.globalX, e.globalY); 468 468 469 currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed );469 currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed, 0); 470 470 if (currentDragEffect) 471 webview()->dragTargetDrop(clientPoint, screenPoint );471 webview()->dragTargetDrop(clientPoint, screenPoint, 0); 472 472 else 473 473 webview()->dragTargetDragLeave(); … … 510 510 WebPoint clientPoint(e.x, e.y); 511 511 WebPoint screenPoint(e.globalX, e.globalY); 512 currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed );512 currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed, 0); 513 513 } 514 514 … … 913 913 914 914 // Provide a drag source. 915 webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed );915 webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed, 0); 916 916 917 917 // dragMode saves events and then replays them later. We don't need/want that.
Note: See TracChangeset
for help on using the changeset viewer.