Changeset 91222 in webkit


Ignore:
Timestamp:
Jul 18, 2011 5:14:48 PM (13 years ago)
Author:
bweinstein@apple.com
Message:

Prep work for: Crash under WebPage::platformDragEnded when dragging on Mac
https://bugs.webkit.org/show_bug.cgi?id=64766
<rdar://problem/9548174>

Reviewed by Darin Adler.

Add a DragClient function that is called when a drag is ended, and call it from DragController::dragEnded.
This isn't used yet, but will be used by WebKit2 on Mac.

This patch also cleans up style in DragClient.h.

No change in behavior, no tests needed.

  • page/DragClient.h:

(WebCore::DragClient::dragEnded): Stub virtual implementation for now, this will be used by

WebKit2 on Mac.

  • page/DragController.cpp:

(WebCore::DragController::dragEnded): Call DragClient::dragEnded.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r91219 r91222  
     12011-07-18  Brian Weinstein  <bweinstein@apple.com>
     2
     3        Prep work for: Crash under WebPage::platformDragEnded when dragging on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=64766
     5        <rdar://problem/9548174>
     6       
     7        Reviewed by Darin Adler.
     8
     9        Add a DragClient function that is called when a drag is ended, and call it from DragController::dragEnded.
     10        This isn't used yet, but will be used by WebKit2 on Mac.
     11       
     12        This patch also cleans up style in DragClient.h.
     13
     14        No change in behavior, no tests needed.
     15
     16        * page/DragClient.h:
     17        (WebCore::DragClient::dragEnded): Stub virtual implementation for now, this will be used by
     18            WebKit2 on Mac.
     19        * page/DragController.cpp:
     20        (WebCore::DragController::dragEnded): Call DragClient::dragEnded.
     21
    1222011-07-18  Jon Honeycutt  <jhoneycutt@apple.com>
    223
  • trunk/Source/WebCore/page/DragClient.h

    r77870 r91222  
    5959        virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard*) = 0;
    6060        virtual DragDestinationAction actionMaskForDrag(DragData*) = 0;
    61         //We work in window rather than view coordinates here
     61
     62        // We work in window rather than view coordinates here.
    6263        virtual DragSourceAction dragSourceActionMaskForPoint(const IntPoint& windowPoint) = 0;
    6364       
     
    6566       
    6667        virtual void dragControllerDestroyed() = 0;
     68
    6769#if PLATFORM(MAC)
    68         //Mac specific helper functions to allow access to functionality in webkit -- such as
    69         //web archives and NSPasteboard extras
    70         //not abstract as that would require another #if PLATFORM(MAC) for the SVGImage client empty impl
    71         virtual void declareAndWriteDragImage(NSPasteboard*, DOMElement*, NSURL*, NSString*, Frame*) {};
     70        // Mac-specific helper function to allow access to web archives and NSPasteboard extras in WebKit.
     71        // This is not abstract as that would require another #if PLATFORM(MAC) for the SVGImage client empty implentation.
     72        virtual void declareAndWriteDragImage(NSPasteboard *, DOMElement*, NSURL *, NSString *, Frame*) { }
    7273#endif
    7374       
    74         virtual ~DragClient() {};
     75        virtual void dragEnded() { }
     76
     77        virtual ~DragClient() { }
    7578    };
    7679   
  • trunk/Source/WebCore/page/DragController.cpp

    r90098 r91222  
    159159    m_didInitiateDrag = false;
    160160    m_page->dragCaretController()->clear();
     161   
     162    m_client->dragEnded();
    161163}
    162164
Note: See TracChangeset for help on using the changeset viewer.