Title: [175964] trunk/Source
Revision
175964
Author
[email protected]
Date
2014-11-11 11:18:58 -0800 (Tue, 11 Nov 2014)

Log Message

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.

* UIProcess/mac/WKActionMenuController.mm:
(-[WKActionMenuController _defaultMenuItemsForDataDetectedText]):
Use the new SPI instead of WKSI.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (175963 => 175964)


--- trunk/Source/WebCore/ChangeLog	2014-11-11 19:17:11 UTC (rev 175963)
+++ trunk/Source/WebCore/ChangeLog	2014-11-11 19:18:58 UTC (rev 175964)
@@ -1,5 +1,16 @@
 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-11  Tim Horton  <[email protected]>
+
         Data Detectors popovers should be dismissed upon scrolling
         https://bugs.webkit.org/show_bug.cgi?id=138600
         <rdar://problem/18932770>

Modified: trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (175963 => 175964)


--- trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h	2014-11-11 19:17:11 UTC (rev 175963)
+++ trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h	2014-11-11 19:18:58 UTC (rev 175964)
@@ -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: trunk/Source/WebKit2/ChangeLog (175963 => 175964)


--- trunk/Source/WebKit2/ChangeLog	2014-11-11 19:17:11 UTC (rev 175963)
+++ trunk/Source/WebKit2/ChangeLog	2014-11-11 19:18:58 UTC (rev 175964)
@@ -1,5 +1,17 @@
 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-11  Tim Horton  <[email protected]>
+
         Data Detectors popovers should be dismissed upon scrolling
         https://bugs.webkit.org/show_bug.cgi?id=138600
         <rdar://problem/18932770>

Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (175963 => 175964)


--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm	2014-11-11 19:17:11 UTC (rev 175963)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm	2014-11-11 19:18:58 UTC (rev 175964)
@@ -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

Reply via email to