Give clients a way to cancel preview popovers

https://bugs.webkit.org/show_bug.cgi?id=138855

Reviewed by Tim Horton.

Promote -[WKView _dismissActionMenuPopovers] from internal to private.

* UIProcess/API/Cocoa/WKViewPrivate.h:
* UIProcess/API/mac/WKView.mm:
(-[WKView _dismissActionMenuPopovers]):
* UIProcess/API/mac/WKViewInternal.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176299 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 8441d51..6d2bed8 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2014-11-18  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Give clients a way to cancel preview popovers
+        https://bugs.webkit.org/show_bug.cgi?id=138855
+
+        Reviewed by Tim Horton.
+
+        Promote -[WKView _dismissActionMenuPopovers] from internal to private.
+
+        * UIProcess/API/Cocoa/WKViewPrivate.h:
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _dismissActionMenuPopovers]):
+        * UIProcess/API/mac/WKViewInternal.h:
+
 2014-11-18  Chris Dumez  <cdumez@apple.com>
 
         Add a setting to toggle DOMTimer throttling support

diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h b/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
index 2c2dfb7..9b259e1 100644 (file)
--- a/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
+++ b/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
@@ -126,4 +126,6 @@
 - (void)_finishPreviewingURL:(NSURL *)url withPreviewView:(NSView *)previewView;
 #endif
 
+- (void)_dismissActionMenuPopovers;
+
 @end

diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.mm b/Source/WebKit2/UIProcess/API/mac/WKView.mm
index 9d13cb8..4323a2b 100644 (file)
--- a/Source/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKView.mm
@@ -3709,13 +3709,6 @@ static NSString *pathWithUniqueFilenameForPath(NSString *path)
 
 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 
-- (void)_dismissActionMenuPopovers
-{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-    [_data->_actionMenuController dismissActionMenuPopovers];
-#endif
-}
-
 @end
 
 @implementation WKView (Private)
@@ -4211,6 +4204,13 @@ static NSString *pathWithUniqueFilenameForPath(NSString *path)
     return [self _actionMenuItemsForHitTestResult:hitTestResult withType:type defaultActionMenuItems:defaultMenuItems];
 }
 
+- (void)_dismissActionMenuPopovers
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+    [_data->_actionMenuController dismissActionMenuPopovers];
+#endif
+}
+
 - (NSView *)_viewForPreviewingURL:(NSURL *)url initialFrameSize:(NSSize)initialFrameSize
 {
     return nil;

diff --git a/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h b/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h
index f062810..d7f27d1 100644 (file)
--- a/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h
+++ b/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h
@@ -132,8 +132,6 @@ struct WebPageConfiguration;
 - (void)_didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData;
 #endif
 
-- (void)_dismissActionMenuPopovers;
-
 @property (nonatomic, retain, setter=_setPrimaryTrackingArea:) NSTrackingArea *_primaryTrackingArea;
 
 @end