Title: [176638] branches/safari-600.3-branch/Source/WebCore
- Revision
- 176638
- Author
- [email protected]
- Date
- 2014-12-02 06:35:50 -0800 (Tue, 02 Dec 2014)
Log Message
Merge r176417. rdar://problem/19021183
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176637 => 176638)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-02 14:33:13 UTC (rev 176637)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-02 14:35:50 UTC (rev 176638)
@@ -1,5 +1,18 @@
2014-12-02 Dana Burkart <[email protected]>
+ Merge r176417. rdar://problem/19021183
+
+ 2014-11-20 Tim Horton <[email protected]>
+
+ Remove a piece of DataDetectors SPI that we aren't using anymore
+ https://bugs.webkit.org/show_bug.cgi?id=138917
+
+ Reviewed by Beth Dakin.
+
+ * platform/spi/mac/DataDetectorsSPI.h:
+
+2014-12-02 Dana Burkart <[email protected]>
+
Merge r176412. rdar://problem/18904600
2014-11-20 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (176637 => 176638)
--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-12-02 14:33:13 UTC (rev 176637)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-12-02 14:35:50 UTC (rev 176638)
@@ -66,7 +66,6 @@
@property NSRect highlightFrame;
@property (retain) NSArray *allResults;
@property (retain) __attribute__((NSObject)) DDResultRef mainResult;
-@property (copy) void (^completionHandler)(void);
@property (assign) BOOL forActionMenuContent;
- (DDActionContext *)contextForView:(NSView *)view altMode:(BOOL)altMode interactionStartedHandler:(void (^)(void))interactionStartedHandler interactionChangedHandler:(void (^)(void))interactionChangedHandler interactionStoppedHandler:(void (^)(void))interactionStoppedHandler;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
