Changeset 122358 in webkit


Ignore:
Timestamp:
Jul 11, 2012 12:59:51 PM (12 years ago)
Author:
tony@chromium.org
Message:

[chromium] Remove drag and drop API methods that are no longer used
​https://bugs.webkit.org/show_bug.cgi?id=90996

Reviewed by Adam Barth.

Source/WebKit/chromium:

In r117327, we added a parameter for modifier keys to these methods.
Chromium has since switched to using the methods that require the
extra parameter so we can remove these methods.

  • public/WebView.h:

(WebView):

  • src/WebViewImpl.cpp:

(WebKit::WebViewImpl::dragTargetDragEnter):
(WebKit::WebViewImpl::dragTargetDragOver):

  • src/WebViewImpl.h:

(WebViewImpl):

Tools:

Migrate DRT to use the methods that take modifier keys.

  • DumpRenderTree/chromium/EventSender.cpp:

(EventSender::doDragDrop):
(EventSender::doMouseUp):
(EventSender::doMouseMove):
(EventSender::beginDragWithFiles):

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r122348 r122358  
     12012-07-11  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
    1202012-07-11  Shawn Singh  <shawnsingh@chromium.org>
    221

  • trunk/Source/WebKit/chromium/public/WebView.h

    r121310 r122358  
    318318    // Callback methods when a drag-and-drop operation is trying to drop
    319319    // 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;
    325320    virtual WebDragOperation dragTargetDragEnter(
    326321        const WebDragData&,
    … …  
    328323        WebDragOperationsMask operationsAllowed,
    329324        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;
    334325    virtual WebDragOperation dragTargetDragOver(
    335326        const WebPoint& clientPoint, const WebPoint& screenPoint,
    … …  
    337328        int keyModifiers) = 0;
    338329    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;
    342330    virtual void dragTargetDrop(
    343331        const WebPoint& clientPoint, const WebPoint& screenPoint,

  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r122284 r122358  
    27972797    const WebPoint& clientPoint,
    27982798    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,
    28082799    WebDragOperationsMask operationsAllowed,
    28092800    int keyModifiers)
    … …  
    28152806
    28162807    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);
    28252808}
    28262809
    … …  
    28522835    m_dragOperation = WebDragOperationNone;
    28532836    m_currentDragData = 0;
    2854 }
    2855 
    2856 void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint,
    2857                                  const WebPoint& screenPoint)
    2858 {
    2859     dragTargetDrop(clientPoint, screenPoint, 0);
    28602837}
    28612838

  • trunk/Source/WebKit/chromium/src/WebViewImpl.h

    r121310 r122358  
    240240        const WebPoint& clientPoint,
    241241        const WebPoint& screenPoint,
    242         WebDragOperationsMask operationsAllowed);
    243     virtual WebDragOperation dragTargetDragEnter(
    244         const WebDragData&,
    245         const WebPoint& clientPoint,
    246         const WebPoint& screenPoint,
    247242        WebDragOperationsMask operationsAllowed,
    248243        int keyModifiers);
    249     virtual WebDragOperation dragTargetDragOver(
    250         const WebPoint& clientPoint,
    251         const WebPoint& screenPoint,
    252         WebDragOperationsMask operationsAllowed);
    253244    virtual WebDragOperation dragTargetDragOver(
    254245        const WebPoint& clientPoint,
    … …  
    257248        int keyModifiers);
    258249    virtual void dragTargetDragLeave();
    259     virtual void dragTargetDrop(
    260         const WebPoint& clientPoint,
    261         const WebPoint& screenPoint);
    262250    virtual void dragTargetDrop(
    263251        const WebPoint& clientPoint,

  • trunk/Tools/ChangeLog

    r122352 r122358  
     12012-07-11  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
    1162012-07-11  Mark Rowe  <mrowe@apple.com>
    217

  • trunk/Tools/DumpRenderTree/chromium/EventSender.cpp

    r119356 r122358  
    352352    currentDragData = dragData;
    353353    currentDragEffectsAllowed = mask;
    354     currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed);
     354    currentDragEffect = webview()->dragTargetDragEnter(dragData, clientPoint, screenPoint, currentDragEffectsAllowed, 0);
    355355
    356356    // Finish processing events.
    … …  
    467467    WebPoint screenPoint(e.globalX, e.globalY);
    468468
    469     currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed);
     469    currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed, 0);
    470470    if (currentDragEffect)
    471         webview()->dragTargetDrop(clientPoint, screenPoint);
     471        webview()->dragTargetDrop(clientPoint, screenPoint, 0);
    472472    else
    473473        webview()->dragTargetDragLeave();
    … …  
    510510    WebPoint clientPoint(e.x, e.y);
    511511    WebPoint screenPoint(e.globalX, e.globalY);
    512     currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed);
     512    currentDragEffect = webview()->dragTargetDragOver(clientPoint, screenPoint, currentDragEffectsAllowed, 0);
    513513}
    514514
    … …  
    913913
    914914    // Provide a drag source.
    915     webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed);
     915    webview()->dragTargetDragEnter(currentDragData, lastMousePos, lastMousePos, currentDragEffectsAllowed, 0);
    916916
    917917    // dragMode saves events and then replays them later. We don't need/want that.
Note: See TracChangeset for help on using the changeset viewer.