Changeset 176299 in webkit

Timestamp:

Nov 18, 2014, 5:43:14 PM (12 years ago)

Author:

Conrad Shultz

Message:

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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKViewPrivate.h (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)
• UIProcess/API/mac/WKViewInternal.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h

@@ -127 +127 @@
 #endif
 
+- (void)_dismissActionMenuPopovers;
+
 @end

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -3710 +3710 @@
 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 
-- (void)_dismissActionMenuPopovers
-{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-    [_data->_actionMenuController dismissActionMenuPopovers];
-#endif
-}
-
 @end
 
@@ -4212 +4205 @@
 }
 
+- (void)_dismissActionMenuPopovers
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+    [_data->_actionMenuController dismissActionMenuPopovers];
+#endif
+}
+
 - (NSView *)_viewForPreviewingURL:(NSURL *)url initialFrameSize:(NSSize)initialFrameSize
 {

trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

@@ -133 +133 @@
 #endif
 
-- (void)_dismissActionMenuPopovers;
-
 @property (nonatomic, retain, setter=_setPrimaryTrackingArea:) NSTrackingArea *_primaryTrackingArea;