⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 184018 in webkit


Ignore:
Timestamp:
May 8, 2015, 3:11:30 PM (11 years ago)
Author:
ap@apple.com
Message:

Build fix.

Reviewed by Dan Bernstein.

  • DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h:
  • DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:

(-[DumpRenderTreeDraggingInfo springLoadingHighlight]):
(-[DumpRenderTreeDraggingInfo resetSpringLoading]):

  • WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h:
  • WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm:

(-[WebKitTestRunnerDraggingInfo springLoadingHighlight]):
(-[WebKitTestRunnerDraggingInfo resetSpringLoading]):

Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r184015 r184018  
     12015-05-08  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Build fix.
     4
     5        Reviewed by Dan Bernstein.
     6
     7        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h:
     8        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
     9        (-[DumpRenderTreeDraggingInfo springLoadingHighlight]):
     10        (-[DumpRenderTreeDraggingInfo resetSpringLoading]):
     11        * WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h:
     12        * WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm:
     13        (-[WebKitTestRunnerDraggingInfo springLoadingHighlight]):
     14        (-[WebKitTestRunnerDraggingInfo resetSpringLoading]):
     15
    1162015-05-08  Martin Robinson  <mrobinson@igalia.com>
    217

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h

    r165676 r184018  
    5252- (void)slideDraggedImageTo:(NSPoint)screenPoint;
    5353- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination;
     54
     55#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     56#pragma clang diagnostic push
     57#pragma clang diagnostic ignored "-Wincompatible-property-type"
     58// FIXME (<rdar://problem/20880213>): Replace NSInteger with an actual type when we can.
     59@property (readonly) NSInteger springLoadingHighlight;
     60#pragma clang diagnostic pop
     61- (void)resetSpringLoading;
     62#endif
    5463@end
    5564

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm

    r165676 r184018  
    143143}
    144144
     145#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     146-(NSInteger)springLoadingHighlight
     147{
     148    return 0;
     149}
     150
     151- (void)resetSpringLoading
     152{
     153}
     154#endif
     155
    145156@end
    146157

  • trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h

    r154949 r184018  
    4545- (void)slideDraggedImageTo:(NSPoint)screenPoint;
    4646- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination;
     47
     48#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     49#pragma clang diagnostic push
     50#pragma clang diagnostic ignored "-Wincompatible-property-type"
     51// FIXME (<rdar://problem/20880213>): Replace NSInteger with an actual type when we can.
     52@property (readonly) NSInteger springLoadingHighlight;
     53#pragma clang diagnostic pop
     54- (void)resetSpringLoading;
     55#endif
    4756@end

  • trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm

    r179409 r184018  
    147147}
    148148
     149#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
     150-(NSInteger)springLoadingHighlight
     151{
     152    return 0;
     153}
     154
     155- (void)resetSpringLoading
     156{
     157}
     158#endif
     159
    149160@end
Note: See TracChangeset for help on using the changeset viewer.