Changeset 211192 in webkit


Ignore:
Timestamp:
Jan 25, 2017 6:01:29 PM (7 years ago)
Author:
Wenson Hsieh
Message:

Refactor drag and drop implementation on Mac
​https://bugs.webkit.org/show_bug.cgi?id=167427

Reviewed by Enrica Casucci.

Source/WebCore:

Refactors some code around drag and drop on Mac, and cleans up some other related code as needed. This patch
should result in no behavior change.

  • dom/DataTransfer.cpp:
  • page/EventHandler.cpp:
  • page/ios/EventHandlerIOS.mm:

(WebCore::EventHandler::eventLoopHandleMouseDragged):

  • page/mac/EventHandlerMac.mm:
  • platform/DragImage.cpp:
  • platform/Pasteboard.h:
  • platform/ios/DragImageIOS.mm:
  • platform/ios/PasteboardIOS.mm:
  • platform/mac/DragDataMac.mm:

(rtfPasteboardType):
(rtfdPasteboardType):
(stringPasteboardType):
(urlPasteboardType):
(htmlPasteboardType):
(colorPasteboardType):
(pdfPasteboardType):
(tiffPasteboardType):
(WebCore::DragData::DragData):
(WebCore::DragData::containsColor):
(WebCore::DragData::containsFiles):
(WebCore::DragData::numberOfFiles):
(WebCore::DragData::asFilenames):
(WebCore::DragData::containsPlainText):
(WebCore::DragData::containsCompatibleContent):
(WebCore::DragData::containsPromise):
(WebCore::DragData::asURL):

  • platform/mac/DragImageMac.mm:

Source/WebKit/mac:

Refactor some WebKit1 code on the Mac pertaining to drag and drop. See WebCore ChangeLog for more details.

  • Misc/WebNSPasteboardExtras.h:
  • WebCoreSupport/WebDragClient.mm:
  • WebView/WebFrame.mm:
  • WebView/WebFrameInternal.h:
  • WebView/WebHTMLView.mm:
  • WebView/WebView.mm:

(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):

Source/WebKit2:

See WebCore ChangeLog for more details.

  • Shared/WebCoreArgumentCoders.cpp:

(IPC::ArgumentCoder<DragData>::encode):
(IPC::ArgumentCoder<DragData>::decode):

  • UIProcess/Cocoa/WebPageProxyCocoa.mm:
  • WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
Location:
trunk/Source
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r211191 r211192  
     12017-01-25  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        Refactor drag and drop implementation on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=167427
     5
     6        Reviewed by Enrica Casucci.
     7
     8        Refactors some code around drag and drop on Mac, and cleans up some other related code as needed. This patch
     9        should result in no behavior change.
     10
     11        * dom/DataTransfer.cpp:
     12        * page/EventHandler.cpp:
     13        * page/ios/EventHandlerIOS.mm:
     14        (WebCore::EventHandler::eventLoopHandleMouseDragged):
     15        * page/mac/EventHandlerMac.mm:
     16        * platform/DragImage.cpp:
     17        * platform/Pasteboard.h:
     18        * platform/ios/DragImageIOS.mm:
     19        * platform/ios/PasteboardIOS.mm:
     20        * platform/mac/DragDataMac.mm:
     21        (rtfPasteboardType):
     22        (rtfdPasteboardType):
     23        (stringPasteboardType):
     24        (urlPasteboardType):
     25        (htmlPasteboardType):
     26        (colorPasteboardType):
     27        (pdfPasteboardType):
     28        (tiffPasteboardType):
     29        (WebCore::DragData::DragData):
     30        (WebCore::DragData::containsColor):
     31        (WebCore::DragData::containsFiles):
     32        (WebCore::DragData::numberOfFiles):
     33        (WebCore::DragData::asFilenames):
     34        (WebCore::DragData::containsPlainText):
     35        (WebCore::DragData::containsCompatibleContent):
     36        (WebCore::DragData::containsPromise):
     37        (WebCore::DragData::asURL):
     38        * platform/mac/DragImageMac.mm:
     39
    1402017-01-25  Youenn Fablet  <youenn@apple.com>
    241

  • trunk/Source/WebCore/dom/DataTransfer.cpp

    r210006 r211192  
    291291}
    292292
    293 #if !PLATFORM(COCOA)
     293#if !PLATFORM(MAC)
    294294
    295295DragImageRef DataTransfer::createDragImage(IntPoint& location) const

  • trunk/Source/WebCore/page/EventHandler.cpp

    r211033 r211192  
    132132const int TextDragHysteresis = 3;
    133133const int GeneralDragHysteresis = 3;
     134#if PLATFORM(COCOA)
     135const double EventHandler::TextDragDelay = 0.15;
     136#endif
    134137#endif // ENABLE(DRAG_SUPPORT)
    135138
    … …  
    807810
    808811#if ENABLE(DRAG_SUPPORT)
    809 bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& event)
     812bool EventHandler::handleMouseDraggedEvent(const MouseEventWithHitTestResults& event, CheckDragHysteresis checkDragHysteresis)
    810813{
    811814    if (!m_mousePressed)
    … …  
    814817    Ref<Frame> protectedFrame(m_frame);
    815818
    816     if (handleDrag(event, ShouldCheckDragHysteresis))
     819    if (handleDrag(event, checkDragHysteresis))
    817820        return true;
    818821

  • trunk/Source/WebCore/page/EventHandler.h

    r211033 r211192  
    339339
    340340#if ENABLE(DRAG_SUPPORT)
    341     bool handleMouseDraggedEvent(const MouseEventWithHitTestResults&);
     341    bool handleMouseDraggedEvent(const MouseEventWithHitTestResults&, CheckDragHysteresis = ShouldCheckDragHysteresis);
    342342#endif
    343343

  • trunk/Source/WebCore/page/ios/EventHandlerIOS.mm

    r211033 r211192  
    4848#if ENABLE(IOS_TOUCH_EVENTS)
    4949#import <WebKitAdditions/EventHandlerIOSTouch.cpp>
     50#endif
     51
     52#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/EventHandlerAdditions.mm>)
     53#import <WebKitAdditions/EventHandlerAdditions.mm>
    5054#endif
    5155

  • trunk/Source/WebCore/page/mac/EventHandlerMac.mm

    r211033 r211192  
    7575namespace WebCore {
    7676
    77 #if ENABLE(DRAG_SUPPORT)
    78 const double EventHandler::TextDragDelay = 0.15;
    79 #endif
    80 
    8177const double resetLatchedStateTimeout = 0.1;
    8278

  • trunk/Source/WebCore/platform/DragImage.cpp

    r208985 r211192  
    121121}
    122122
     123#if !ENABLE(DATA_INTERACTION)
     124
    123125DragImageRef createDragImageForSelection(Frame& frame, bool forceBlackText)
    124126{
    … …  
    126128    return createDragImageFromSnapshot(snapshotSelection(frame, options), nullptr);
    127129}
     130
     131#endif
    128132
    129133struct ScopedFrameSelectionState {

  • trunk/Source/WebCore/platform/Pasteboard.h

    r211158 r211192  
    130130struct PasteboardPlainText {
    131131    String text;
    132 #if PLATFORM(MAC)
     132#if PLATFORM(COCOA)
    133133    bool isURL;
    134134#endif
    … …  
    180180
    181181#if ENABLE(DRAG_SUPPORT)
    182     static std::unique_ptr<Pasteboard> createForDragAndDrop();
    183     static std::unique_ptr<Pasteboard> createForDragAndDrop(const DragData&);
     182    WEBCORE_EXPORT static std::unique_ptr<Pasteboard> createForDragAndDrop();
     183    WEBCORE_EXPORT static std::unique_ptr<Pasteboard> createForDragAndDrop(const DragData&);
    184184
    185185    virtual void setDragImage(DragImageRef, const IntPoint& hotSpot);

  • trunk/Source/WebCore/platform/ios/DragImageIOS.mm

    r165676 r211192  
    2929#import <CoreGraphics/CoreGraphics.h>
    3030
     31#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragImageAdditions.mm>)
     32
     33#import <WebKitAdditions/DragImageAdditions.mm>
     34
     35#else
     36
    3137namespace WebCore {
    3238
    … …  
    5056
    5157} // namespace WebCore
     58
     59#endif // USE(APPLE_INTERNAL_SDK)

  • trunk/Source/WebCore/platform/ios/PasteboardIOS.mm

    r211158 r211192  
    5959@end
    6060
     61#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PasteboardAdditions.mm>)
     62#import <WebKitAdditions/PasteboardAdditions.mm>
     63#endif
     64
    6165namespace WebCore {
    6266

  • trunk/Source/WebCore/platform/mac/DragDataMac.mm

    r210360 r211192  
    3434#import "WebCoreNSURLExtras.h"
    3535
     36#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragDataAdditions.mm>)
     37
     38#import <WebKitAdditions/DragDataAdditions.mm>
     39
     40#else
     41
     42static inline String rtfPasteboardType()
     43{
     44    return String(NSRTFPboardType);
     45}
     46
     47static inline String rtfdPasteboardType()
     48{
     49    return String(NSRTFDPboardType);
     50}
     51
     52static inline String stringPasteboardType()
     53{
     54    return String(NSStringPboardType);
     55}
     56
     57static inline String urlPasteboardType()
     58{
     59    return String(NSURLPboardType);
     60}
     61
     62static inline String htmlPasteboardType()
     63{
     64    return String(NSHTMLPboardType);
     65}
     66
     67static inline String colorPasteboardType()
     68{
     69    return String(NSColorPboardType);
     70}
     71
     72static inline String pdfPasteboardType()
     73{
     74    return String(NSPDFPboardType);
     75}
     76
     77static inline String tiffPasteboardType()
     78{
     79    return String(NSTIFFPboardType);
     80}
     81
     82#endif // USE(APPLE_INTERNAL_SDK)
     83
    3684namespace WebCore {
    3785
    … …  
    4391    , m_draggingSourceOperationMask(sourceOperationMask)
    4492    , m_applicationFlags(flags)
     93#if PLATFORM(MAC)
    4594    , m_pasteboardName([[m_platformDragData draggingPasteboard] name])
     95#else
     96    , m_pasteboardName("data interaction pasteboard")
     97#endif
    4698{
    4799}
    … …  
    67119    Vector<String> types;
    68120    platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
    69     return types.contains(String(NSColorPboardType));
     121    return types.contains(colorPasteboardType());
    70122}
    71123
    72124bool DragData::containsFiles() const
    73125{
     126#if PLATFORM(MAC)
    74127    Vector<String> types;
    75128    platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
    76129    return types.contains(String(NSFilenamesPboardType)) || types.contains(String(NSFilesPromisePboardType));
     130#else
     131    return false;
     132#endif
    77133}
    78134
    … …  
    80136{
    81137    Vector<String> files;
     138#if PLATFORM(MAC)
    82139    platformStrategies()->pasteboardStrategy()->getPathnamesForType(files, String(NSFilenamesPboardType), m_pasteboardName);
    83140    if (!files.size())
    84141        platformStrategies()->pasteboardStrategy()->getPathnamesForType(files, String(NSFilesPromisePboardType), m_pasteboardName);
     142#endif
    85143    return files.size();
    86144}
    … …  
    88146void DragData::asFilenames(Vector<String>& result) const
    89147{
     148#if PLATFORM(MAC)
    90149    platformStrategies()->pasteboardStrategy()->getPathnamesForType(result, String(NSFilenamesPboardType), m_pasteboardName);
    91150    if (!result.size())
    92151        result = fileNames();
     152#else
     153    UNUSED_PARAM(result);
     154#endif
    93155}
    94156
    … …  
    98160    platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
    99161
    100     return types.contains(String(NSStringPboardType))
    101         || types.contains(String(NSRTFDPboardType))
    102         || types.contains(String(NSRTFPboardType))
     162    return types.contains(stringPasteboardType())
     163        || types.contains(rtfdPasteboardType())
     164        || types.contains(rtfPasteboardType())
     165#if PLATFORM(MAC)
    103166        || types.contains(String(NSFilenamesPboardType))
    104         || platformStrategies()->pasteboardStrategy()->stringForType(String(NSURLPboardType), m_pasteboardName).length();
     167#endif
     168        || platformStrategies()->pasteboardStrategy()->stringForType(urlPasteboardType(), m_pasteboardName).length();
    105169}
    106170
    … …  
    131195    platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
    132196    return types.contains(String(WebArchivePboardType))
    133         || types.contains(String(NSHTMLPboardType))
     197        || types.contains(htmlPasteboardType())
     198#if PLATFORM(MAC)
    134199        || types.contains(String(NSFilenamesPboardType))
    135200        || types.contains(String(NSFilesPromisePboardType))
    136         || types.contains(String(NSTIFFPboardType))
    137         || types.contains(String(NSPDFPboardType))
    138         || types.contains(String(NSURLPboardType))
    139         || types.contains(String(NSRTFDPboardType))
    140         || types.contains(String(NSRTFPboardType))
    141         || types.contains(String(NSStringPboardType))
    142         || types.contains(String(NSColorPboardType))
     201#endif
     202        || types.contains(tiffPasteboardType())
     203        || types.contains(pdfPasteboardType())
     204        || types.contains(urlPasteboardType())
     205        || types.contains(rtfdPasteboardType())
     206        || types.contains(rtfPasteboardType())
     207        || types.contains(stringPasteboardType())
     208        || types.contains(colorPasteboardType())
    143209        || types.contains(String(kUTTypePNG));
    144210}
    … …  
    147213{
    148214    Vector<String> files;
     215#if PLATFORM(MAC)
    149216    platformStrategies()->pasteboardStrategy()->getPathnamesForType(files, String(NSFilesPromisePboardType), m_pasteboardName);
     217#endif
    150218    return files.size() == 1;
    151219}
    … …  
    161229
    162230    if (title) {
     231#if PLATFORM(MAC)
    163232        String URLTitleString = platformStrategies()->pasteboardStrategy()->stringForType(String(WebURLNamePboardType), m_pasteboardName);
    164233        if (!URLTitleString.isEmpty())
    165234            *title = URLTitleString;
    166     }
    167    
    168     Vector<String> types;
    169     platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
    170 
    171     if (types.contains(String(NSURLPboardType))) {
    172         NSURL *URLFromPasteboard = [NSURL URLWithString:platformStrategies()->pasteboardStrategy()->stringForType(String(NSURLPboardType), m_pasteboardName)];
     235#endif
     236    }
     237   
     238    Vector<String> types;
     239    platformStrategies()->pasteboardStrategy()->getTypes(types, m_pasteboardName);
     240
     241    if (types.contains(urlPasteboardType())) {
     242        NSURL *URLFromPasteboard = [NSURL URLWithString:platformStrategies()->pasteboardStrategy()->stringForType(urlPasteboardType(), m_pasteboardName)];
    173243        NSString *scheme = [URLFromPasteboard scheme];
    174244        // Cannot drop other schemes unless <rdar://problem/10562662> and <rdar://problem/11187315> are fixed.
    … …  
    177247    }
    178248   
    179     if (types.contains(String(NSStringPboardType))) {
    180         NSURL *URLFromPasteboard = [NSURL URLWithString:platformStrategies()->pasteboardStrategy()->stringForType(String(NSStringPboardType), m_pasteboardName)];
     249    if (types.contains(stringPasteboardType())) {
     250        NSURL *URLFromPasteboard = [NSURL URLWithString:platformStrategies()->pasteboardStrategy()->stringForType(stringPasteboardType(), m_pasteboardName)];
    181251        NSString *scheme = [URLFromPasteboard scheme];
    182252        // Pasteboard content is not trusted, because JavaScript code can modify it. We can sanitize it for URLs and other typed content, but not for strings.
    … …  
    187257    }
    188258   
     259#if PLATFORM(MAC)
    189260    if (types.contains(String(NSFilenamesPboardType))) {
    190261        Vector<String> files;
    … …  
    200271    if (types.contains(String(NSFilesPromisePboardType)) && fileNames().size() == 1)
    201272        return [URLByCanonicalizingURL([NSURL fileURLWithPath:fileNames()[0]]) absoluteString];
     273#endif
    202274
    203275    return String();       

  • trunk/Source/WebCore/platform/mac/DragImageMac.mm

    r208455 r211192  
    2727#import "DragImage.h"
    2828
    29 #if ENABLE(DRAG_SUPPORT)
     29#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    3030
    3131#import "BitmapImage.h"
    … …  
    349349} // namespace WebCore
    350350
    351 #endif // ENABLE(DRAG_SUPPORT)
     351#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)

  • trunk/Source/WebKit/mac/ChangeLog

    r211161 r211192  
     12017-01-25  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        Refactor drag and drop implementation on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=167427
     5
     6        Reviewed by Enrica Casucci.
     7
     8        Refactor some WebKit1 code on the Mac pertaining to drag and drop. See WebCore ChangeLog for more details.
     9
     10        * Misc/WebNSPasteboardExtras.h:
     11        * WebCoreSupport/WebDragClient.mm:
     12        * WebView/WebFrame.mm:
     13        * WebView/WebFrameInternal.h:
     14        * WebView/WebHTMLView.mm:
     15        * WebView/WebView.mm:
     16        (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
     17
    1182017-01-24  Youenn Fablet  <youennf@gmail.com>
    219

  • trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm

    r208904 r211192  
    2626#import "WebDragClient.h"
    2727
    28 #if ENABLE(DRAG_SUPPORT)
     28#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    2929
    3030#import "DOMElementInternal.h"
    … …  
    144144}
    145145
    146 #endif // ENABLE(DRAG_SUPPORT)
     146#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)

  • trunk/Source/WebKit/mac/WebView/WebFrame.mm

    r211033 r211192  
    934934}
    935935
    936 #if ENABLE(DRAG_SUPPORT)
     936#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    937937- (void)_dragSourceEndedAt:(NSPoint)windowLoc operation:(NSDragOperation)operation
    938938{
    … …  
    947947    _private->coreFrame->eventHandler().dragSourceEndedAt(event, (DragOperation)operation);
    948948}
    949 #endif
     949#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    950950
    951951- (BOOL)_canProvideDocumentSource

  • trunk/Source/WebKit/mac/WebView/WebFrameInternal.h

    r196489 r211192  
    180180- (void)_setTypingStyle:(DOMCSSStyleDeclaration *)style withUndoAction:(WebCore::EditAction)undoAction;
    181181
    182 #if ENABLE(DRAG_SUPPORT)
     182#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    183183- (void)_dragSourceEndedAt:(NSPoint)windowLoc operation:(NSDragOperation)operation;
    184184#endif

  • trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

    r210779 r211192  
    45454545#endif
    45464546
    4547 #if ENABLE(DRAG_SUPPORT)
     4547#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    45484548- (void)dragImage:(NSImage *)dragImage
    45494549               at:(NSPoint)at
    … …  
    46894689    return [NSArray arrayWithObject:[path lastPathComponent]];
    46904690}
    4691 #endif
     4691#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    46924692
    46934693#if !PLATFORM(IOS)

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r211161 r211192  
    16091609    );
    16101610    pageConfiguration.chromeClient = new WebChromeClientIOS(self);
    1611 #if ENABLE(DRAG_SUPPORT)
     1611#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    16121612    pageConfiguration.dragClient = new WebDragClient(self);
    16131613#endif
    … …  
    64766476}
    64776477
    6478 #if ENABLE(DRAG_SUPPORT)
     6478#if ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    64796479// The following 2 internal NSView methods are called on the drag destination to make scrolling while dragging work.
    64806480// Scrolling while dragging will only work if the drag destination is in a scroll view. The WebView is the drag destination.
    … …  
    65976597    return hitView;
    65986598}
    6599 #endif
     6599#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(MAC)
    66006600
    66016601- (BOOL)acceptsFirstResponder

  • trunk/Source/WebKit2/ChangeLog

    r211172 r211192  
     12017-01-25  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        Refactor drag and drop implementation on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=167427
     5
     6        Reviewed by Enrica Casucci.
     7
     8        See WebCore ChangeLog for more details.
     9
     10        * Shared/WebCoreArgumentCoders.cpp:
     11        (IPC::ArgumentCoder<DragData>::encode):
     12        (IPC::ArgumentCoder<DragData>::decode):
     13        * UIProcess/Cocoa/WebPageProxyCocoa.mm:
     14        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
     15
    1162017-01-25  Andy Estes  <aestes@apple.com>
    217

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

    r210560 r211192  
    12241224    encoder.encodeEnum(dragData.draggingSourceOperationMask());
    12251225    encoder.encodeEnum(dragData.flags());
     1226#if PLATFORM(COCOA)
     1227    encoder << dragData.pasteboardName();
     1228#endif
    12261229#if PLATFORM(MAC)
    1227     encoder << dragData.pasteboardName();
    12281230    encoder << dragData.fileNames();
    12291231#endif
    … …  
    12491251
    12501252    String pasteboardName;
     1253#if PLATFORM(COCOA)
     1254    if (!decoder.decode(pasteboardName))
     1255        return false;
     1256#endif
     1257    Vector<String> fileNames;
    12511258#if PLATFORM(MAC)
    1252     if (!decoder.decode(pasteboardName))
    1253         return false;
    1254 #endif
    1255     Vector<String> fileNames;
    12561259    if (!decoder.decode(fileNames))
    12571260        return false;
     1261#endif
    12581262
    12591263    dragData = DragData(pasteboardName, clientPosition, globalPosition, draggingSourceOperationMask, applicationFlags);

  • trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm

    r208361 r211192  
    3434#import <WebCore/ValidationBubble.h>
    3535#import <wtf/cf/TypeCastsCF.h>
     36
     37#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebPageProxyAdditions.mm>)
     38#import <WebKitAdditions/WebPageProxyAdditions.mm>
     39#endif
    3640
    3741namespace WebKit {

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm

    r208596 r211192  
    5151using namespace WebCore;
    5252using namespace WebKit;
     53
     54#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebDragClientAdditions.mm>)
     55#import <WebKitAdditions/WebDragClientAdditions.mm>
     56#endif
     57
     58#if PLATFORM(MAC)
    5359
    5460namespace WebKit {
    … …  
    161167} // namespace WebKit
    162168
     169#endif // PLATFORM(MAC)
     170
    163171#endif // ENABLE(DRAG_SUPPORT)
Note: See TracChangeset for help on using the changeset viewer.