Title: [191061] branches/safari-601-branch/Source/WebCore
- Revision
- 191061
- Author
- matthew_han...@apple.com
- Date
- 2015-10-14 12:52:21 -0700 (Wed, 14 Oct 2015)
Log Message
Merge r188473. rdar://problem/22801969
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (191060 => 191061)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-14 19:18:36 UTC (rev 191060)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-14 19:52:21 UTC (rev 191061)
@@ -1,3 +1,13 @@
+2015-10-14 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r188473. rdar://problem/22801969
+
+ 2015-08-14 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build.
+
+ * platform/spi/mac/LookupSPI.h:
+
2015-10-13 Matthew Hanson <matthew_han...@apple.com>
Merge r190570. rdar://problem/23075530
Modified: branches/safari-601-branch/Source/WebCore/platform/spi/mac/LookupSPI.h (191060 => 191061)
--- branches/safari-601-branch/Source/WebCore/platform/spi/mac/LookupSPI.h 2015-10-14 19:18:36 UTC (rev 191060)
+++ branches/safari-601-branch/Source/WebCore/platform/spi/mac/LookupSPI.h 2015-10-14 19:52:21 UTC (rev 191061)
@@ -42,7 +42,6 @@
+ (NSRange)tokenRangeForString:(NSString *)string range:(NSRange)range options:(NSDictionary **)options;
+ (void)showDefinitionForTerm:(NSAttributedString *)term atLocation:(NSPoint)screenPoint options:(NSDictionary *)options;
-+ (void)showDefinitionForTerm:(NSAttributedString *)term relativeToRect:(NSRect)positioningRect ofView:(NSView *)positioningView options:(NSDictionary *)options;
+ (void)hideDefinition;
@end
@@ -57,6 +56,8 @@
+ (id<NSImmediateActionAnimationController>)lookupAnimationControllerForTerm:(NSAttributedString *)term relativeToRect:(NSRect)positioningRect ofView:(NSView *)positioningView options:(NSDictionary *)options;
++ (void)showDefinitionForTerm:(NSAttributedString *)term relativeToRect:(NSRect)positioningRect ofView:(NSView *)positioningView options:(NSDictionary *)options;
+
@end
#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
