Title: [184286] branches/safari-601.1.32-branch/Tools
Diff
Modified: branches/safari-601.1.32-branch/Tools/ChangeLog (184285 => 184286)
--- branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-13 09:31:21 UTC (rev 184285)
+++ branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-13 09:32:00 UTC (rev 184286)
@@ -1,5 +1,24 @@
2015-05-13 Babak Shafiei <[email protected]>
+ Merge r184018.
+
+ 2015-05-08 Alexey Proskuryakov <[email protected]>
+
+ 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-13 Babak Shafiei <[email protected]>
+
Merge r183915.
2015-05-06 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-601.1.32-branch/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h (184285 => 184286)
--- branches/safari-601.1.32-branch/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h 2015-05-13 09:31:21 UTC (rev 184285)
+++ branches/safari-601.1.32-branch/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h 2015-05-13 09:32:00 UTC (rev 184286)
@@ -51,6 +51,15 @@
- (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
Modified: branches/safari-601.1.32-branch/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm (184285 => 184286)
--- branches/safari-601.1.32-branch/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm 2015-05-13 09:31:21 UTC (rev 184285)
+++ branches/safari-601.1.32-branch/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm 2015-05-13 09:32:00 UTC (rev 184286)
@@ -142,6 +142,17 @@
// Ignored.
}
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+-(NSInteger)springLoadingHighlight
+{
+ return 0;
+}
+
+- (void)resetSpringLoading
+{
+}
+#endif
+
@end
#endif // !PLATFORM(IOS)
Modified: branches/safari-601.1.32-branch/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h (184285 => 184286)
--- branches/safari-601.1.32-branch/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h 2015-05-13 09:31:21 UTC (rev 184285)
+++ branches/safari-601.1.32-branch/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h 2015-05-13 09:32:00 UTC (rev 184286)
@@ -44,4 +44,13 @@
- (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
Modified: branches/safari-601.1.32-branch/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm (184285 => 184286)
--- branches/safari-601.1.32-branch/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm 2015-05-13 09:31:21 UTC (rev 184285)
+++ branches/safari-601.1.32-branch/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm 2015-05-13 09:32:00 UTC (rev 184286)
@@ -146,4 +146,15 @@
// Ignored.
}
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+-(NSInteger)springLoadingHighlight
+{
+ return 0;
+}
+
+- (void)resetSpringLoading
+{
+}
+#endif
+
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
