Title: [176053] branches/safari-600.3-branch/Source
- Revision
- 176053
- Author
- [email protected]
- Date
- 2014-11-12 17:58:36 -0800 (Wed, 12 Nov 2014)
Log Message
Merged r175964. rdar://problems/18867627
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176052 => 176053)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-13 01:52:47 UTC (rev 176052)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-13 01:58:36 UTC (rev 176053)
@@ -1,5 +1,21 @@
2014-11-12 Matthew Hanson <[email protected]>
+ Merge r175964. <rdar://problem/18867627>
+
+ 2014-11-11 Tim Horton <[email protected]>
+
+ Adopt DDActionContext menu type SPI
+ https://bugs.webkit.org/show_bug.cgi?id=138603
+ <rdar://problem/18867627>
+
+ Reviewed by Anders Carlsson.
+
+ * platform/spi/mac/DataDetectorsSPI.h:
+ Add the new SPI.
+
+
+2014-11-12 Matthew Hanson <[email protected]>
+
Merge r175963. <rdar://problem/18932770>
2014-11-11 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (176052 => 176053)
--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-13 01:52:47 UTC (rev 176052)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-13 01:58:36 UTC (rev 176053)
@@ -67,6 +67,7 @@
@property (retain) NSArray *allResults;
@property (retain) __attribute__((NSObject)) DDResultRef mainResult;
@property (copy) void (^completionHandler)(void);
+@property (assign) BOOL forActionMenuContent;
@end
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176052 => 176053)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-13 01:52:47 UTC (rev 176052)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-13 01:58:36 UTC (rev 176053)
@@ -1,5 +1,22 @@
2014-11-12 Matthew Hanson <[email protected]>
+ Merge r175964. <rdar://problem/18867627>
+
+ 2014-11-11 Tim Horton <[email protected]>
+
+ Adopt DDActionContext menu type SPI
+ https://bugs.webkit.org/show_bug.cgi?id=138603
+ <rdar://problem/18867627>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForDataDetectedText]):
+ Use the new SPI instead of WKSI.
+
+
+2014-11-12 Matthew Hanson <[email protected]>
+
Merge r175963. <rdar://problem/18932770>
2014-11-11 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176052 => 176053)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-13 01:52:47 UTC (rev 176052)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-13 01:58:36 UTC (rev 176053)
@@ -562,7 +562,7 @@
[self _hideTextIndicator];
};
- WKSetDDActionContextIsForActionMenu(actionContext);
+ actionContext.forActionMenuContent = YES;
actionContext.highlightFrame = [_wkView.window convertRectToScreen:[_wkView convertRect:_hitTestResult.detectedDataBoundingBox toView:nil]];
return [[getDDActionsManagerClass() sharedManager] menuItemsForResult:[_hitTestResult.actionContext mainResult] actionContext:actionContext];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
