Title: [176869] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 176869
- Author
- [email protected]
- Date
- 2014-12-05 13:25:09 -0800 (Fri, 05 Dec 2014)
Log Message
Merged r176820. rdar://problems/19147218
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176868 => 176869)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-05 21:17:16 UTC (rev 176868)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-05 21:25:09 UTC (rev 176869)
@@ -1,5 +1,26 @@
2014-12-05 Dana Burkart <[email protected]>
+ Merge r176820. <rdar://problem/19147218>
+
+ 2014-12-04 Beth Dakin <[email protected]>
+
+ Clients disabling action menus sometimes still invoke action menu behaviors
+ https://bugs.webkit.org/show_bug.cgi?id=139270
+ -and corresponding-
+ rdar://problem/19147218
+
+ Reviewed by Tim Horton.
+
+ By default, we will keep a single item in the action menu up until the point where
+ _state == ActionMenuState::Ready. So by checking _state here, we are preventing
+ clients from opting out of our choice to wait. Ideally we would always still wait
+ for the Ready state, but this will get the best behavior in the mean time.
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _updateActionMenuItems]):
+
+
+2014-12-05 Dana Burkart <[email protected]>
+
Merge r176811. <rdar://problem/19140827>
2014-12-04 Timothy Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176868 => 176869)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-05 21:17:16 UTC (rev 176868)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-05 21:25:09 UTC (rev 176869)
@@ -1182,7 +1182,7 @@
for (NSMenuItem *item in menuItems)
[_wkView.actionMenu addItem:item];
- if (_state == ActionMenuState::Ready && !_wkView.actionMenu.numberOfItems)
+ if (!_wkView.actionMenu.numberOfItems)
[_wkView.actionMenu cancelTracking];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
