Title: [185530] trunk/Tools
- Revision
- 185530
- Author
- [email protected]
- Date
- 2015-06-12 19:27:56 -0700 (Fri, 12 Jun 2015)
Log Message
Update springLoadingHighlight type
https://bugs.webkit.org/show_bug.cgi?id=145939
rdar://problem/20880213
Reviewed by Darin Adler.
* DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h:
* DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
* WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h:
* WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (185529 => 185530)
--- trunk/Tools/ChangeLog 2015-06-13 01:40:57 UTC (rev 185529)
+++ trunk/Tools/ChangeLog 2015-06-13 02:27:56 UTC (rev 185530)
@@ -1,3 +1,16 @@
+2015-06-12 Alexey Proskuryakov <[email protected]>
+
+ Update springLoadingHighlight type
+ https://bugs.webkit.org/show_bug.cgi?id=145939
+ rdar://problem/20880213
+
+ Reviewed by Darin Adler.
+
+ * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h:
+ * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
+ * WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h:
+ * WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm:
+
2015-06-12 Dewei Zhu <[email protected]>
Move cursor to (10, 0) instead of (0, 0) and polish the mouse move code
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h (185529 => 185530)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h 2015-06-13 01:40:57 UTC (rev 185529)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h 2015-06-13 02:27:56 UTC (rev 185530)
@@ -53,11 +53,7 @@
- (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
+@property (readonly) NSSpringLoadingHighlight springLoadingHighlight;
- (void)resetSpringLoading;
#endif
@end
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm (185529 => 185530)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm 2015-06-13 01:40:57 UTC (rev 185529)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm 2015-06-13 02:27:56 UTC (rev 185530)
@@ -143,9 +143,9 @@
}
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
--(NSInteger)springLoadingHighlight
+-(NSSpringLoadingHighlight)springLoadingHighlight
{
- return 0;
+ return NSSpringLoadingHighlightNone;
}
- (void)resetSpringLoading
Modified: trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h (185529 => 185530)
--- trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h 2015-06-13 01:40:57 UTC (rev 185529)
+++ trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.h 2015-06-13 02:27:56 UTC (rev 185530)
@@ -46,11 +46,7 @@
- (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
+@property (readonly) NSSpringLoadingHighlight springLoadingHighlight;
- (void)resetSpringLoading;
#endif
@end
Modified: trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm (185529 => 185530)
--- trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm 2015-06-13 01:40:57 UTC (rev 185529)
+++ trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm 2015-06-13 02:27:56 UTC (rev 185530)
@@ -147,9 +147,9 @@
}
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
--(NSInteger)springLoadingHighlight
+-(NSSpringLoadingHighlight)springLoadingHighlight
{
- return 0;
+ return NSSpringLoadingHighlightNone;
}
- (void)resetSpringLoading
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
