Changeset 175964 in webkit

Timestamp:

Nov 11, 2014, 11:18:58 AM (12 years ago)

Author:

timothy_horton@apple.com

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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/mac/DataDetectorsSPI.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/WKActionMenuController.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-11  Tim Horton  <timothy_horton@apple.com>
+
+        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  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h

@@ -68 +68 @@
 @property (retain) __attribute__((NSObject)) DDResultRef mainResult;
 @property (copy) void (^completionHandler)(void);
+@property (assign) BOOL forActionMenuContent;
 
 @end

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-11  Tim Horton  <timothy_horton@apple.com>
+
+        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  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm

@@ -563 +563 @@
     };
 
-    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];