Title: [176346] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 176346
- Author
- [email protected]
- Date
- 2014-11-19 14:24:16 -0800 (Wed, 19 Nov 2014)
Log Message
Merge r176299. rdar://problem/19024541
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176345 => 176346)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-19 22:20:03 UTC (rev 176345)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-19 22:24:16 UTC (rev 176346)
@@ -1,5 +1,23 @@
2014-11-19 Dana Burkart <[email protected]>
+ Merge r176299. rdar://problem/19024541
+
+ 2014-11-18 Conrad Shultz <[email protected]>
+
+ 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-19 Dana Burkart <[email protected]>
+
Merge r176288. rdar://problem/18840382
2014-11-18 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (176345 => 176346)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-11-19 22:20:03 UTC (rev 176345)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h 2014-11-19 22:24:16 UTC (rev 176346)
@@ -125,4 +125,6 @@
- (void)_finishPreviewingURL:(NSURL *)url withPreviewView:(NSView *)previewView;
#endif
+- (void)_dismissActionMenuPopovers;
+
@end
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (176345 => 176346)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-19 22:20:03 UTC (rev 176345)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-11-19 22:24:16 UTC (rev 176346)
@@ -3709,13 +3709,6 @@
#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)
@@ -4206,6 +4199,13 @@
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;
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (176345 => 176346)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-11-19 22:20:03 UTC (rev 176345)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2014-11-19 22:24:16 UTC (rev 176346)
@@ -132,8 +132,6 @@
- (void)_didPerformActionMenuHitTest:(const WebKit::ActionMenuHitTestResult&)hitTestResult userData:(API::Object*)userData;
#endif
-- (void)_dismissActionMenuPopovers;
-
@property (nonatomic, retain, setter=_setPrimaryTrackingArea:) NSTrackingArea *_primaryTrackingArea;
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
