Title: [175855] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175855
- Author
- matthew_han...@apple.com
- Date
- 2014-11-10 23:49:01 -0800 (Mon, 10 Nov 2014)
Log Message
Merged r175704. rdar://problems/18869036
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175854 => 175855)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-11 07:43:04 UTC (rev 175854)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-11 07:49:01 UTC (rev 175855)
@@ -1,5 +1,23 @@
2014-11-10 Matthew Hanson <matthew_han...@apple.com>
+ Merge r175704. <rdar://problem/18869036>
+
+ 2014-11-06 Tim Horton <timothy_hor...@apple.com>
+
+ Only provide a single result to the action menu DDActionContext
+ https://bugs.webkit.org/show_bug.cgi?id=138469
+ <rdar://problem/18869036>
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::scanForDataDetectedItems):
+ Only provide one result; secondary results can be extremely unrelated to
+ the primary one and confuse Data Detectors further down the line.
+
+
+2014-11-10 Matthew Hanson <matthew_han...@apple.com>
+
Merge r175702. <rdar://problem/18872825>
2014-11-06 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (175854 => 175855)
--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-11 07:43:04 UTC (rev 175854)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-11 07:49:01 UTC (rev 175855)
@@ -1122,7 +1122,7 @@
return nullptr;
RetainPtr<DDActionContext> actionContext = adoptNS([[getDDActionContextClass() alloc] init]);
- [actionContext setAllResults:(NSArray *)results.get()];
+ [actionContext setAllResults:@[ (id)mainResult ]];
[actionContext setMainResult:mainResult];
Vector<FloatQuad> quads;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
