Title: [176341] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 176341
- Author
- [email protected]
- Date
- 2014-11-19 14:07:48 -0800 (Wed, 19 Nov 2014)
Log Message
Merge r176237. rdar://problem/18900839
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176340 => 176341)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-19 22:07:22 UTC (rev 176340)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-19 22:07:48 UTC (rev 176341)
@@ -1,5 +1,23 @@
2014-11-19 Dana Burkart <[email protected]>
+ Merge r176237. rdar://problem/18900839
+
+ 2014-11-17 Beth Dakin <[email protected]>
+
+ Preview is sometimes dismissed too early
+ https://bugs.webkit.org/show_bug.cgi?id=138811
+ -and corresponding-
+ rdar://problem/18900839
+
+ Reviewed by Tim Horton.
+
+ Don’t make the popover transient until didCloseMenu: time.
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController didCloseMenu:withEvent:]):
+ (-[WKActionMenuController _createPreviewPopoverForURL:originRect:]):
+
+2014-11-19 Dana Burkart <[email protected]>
+
Merge r176221. rdar://problem/18991369
2014-11-17 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176340 => 176341)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-19 22:07:22 UTC (rev 176340)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-19 22:07:48 UTC (rev 176341)
@@ -231,6 +231,7 @@
[getDDActionsManagerClass() didUseActions];
}
+ [_previewPopover setBehavior:NSPopoverBehaviorTransient];
if (!_shouldKeepPreviewPopoverOpen)
[self _clearPreviewPopover];
@@ -338,7 +339,7 @@
_previewViewController->_delegate = self;
_previewPopover = adoptNS([[NSPopover alloc] init]);
- [_previewPopover setBehavior:NSPopoverBehaviorTransient];
+ [_previewPopover setBehavior:NSPopoverBehaviorApplicationDefined];
[_previewPopover setContentSize:popoverSize];
[_previewPopover setContentViewController:_previewViewController.get()];
[_previewPopover setDelegate:self];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
