Build fix.
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 May 2015 22:11:30 +0000 (22:11 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 May 2015 22:11:30 +0000 (22:11 +0000)
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]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@184018 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h
Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm
Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h
Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm

index 13d33af..32bede9 100644 (file)
@@ -1,3 +1,18 @@
+2015-05-08  Alexey Proskuryakov  <ap@apple.com>
+
+        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]):
+
 2015-05-08  Martin Robinson  <mrobinson@igalia.com>
 
         [GTK] Some tests fail because they do not assume the popup menu captures click events
index 2a9cd74..14cdd48 100644 (file)
 
 - (void)slideDraggedImageTo:(NSPoint)screenPoint;
 - (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination;
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wincompatible-property-type"
+// FIXME (<rdar://problem/20880213>): Replace NSInteger with an actual type when we can.
+@property (readonly) NSInteger springLoadingHighlight;
+#pragma clang diagnostic pop
+- (void)resetSpringLoading;
+#endif
 @end
 
 #endif
index 4d72ff6..b0a236b 100644 (file)
     // Ignored.
 }
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+-(NSInteger)springLoadingHighlight
+{
+    return 0;
+}
+
+- (void)resetSpringLoading
+{
+}
+#endif
+
 @end
 
 #endif // !PLATFORM(IOS)
index 321ab23..5a1e87f 100644 (file)
 
 - (void)slideDraggedImageTo:(NSPoint)screenPoint;
 - (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination;
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wincompatible-property-type"
+// FIXME (<rdar://problem/20880213>): Replace NSInteger with an actual type when we can.
+@property (readonly) NSInteger springLoadingHighlight;
+#pragma clang diagnostic pop
+- (void)resetSpringLoading;
+#endif
 @end
index d356d83..1318464 100644 (file)
@@ -146,4 +146,15 @@ using namespace WTR;
     // Ignored.
 }
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+-(NSInteger)springLoadingHighlight
+{
+    return 0;
+}
+
+- (void)resetSpringLoading
+{
+}
+#endif
+
 @end