Title: [176820] trunk/Source/WebKit2
- Revision
- 176820
- Author
- [email protected]
- Date
- 2014-12-04 14:57:53 -0800 (Thu, 04 Dec 2014)
Log Message
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]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (176819 => 176820)
--- trunk/Source/WebKit2/ChangeLog 2014-12-04 22:56:01 UTC (rev 176819)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-04 22:57:53 UTC (rev 176820)
@@ -1,3 +1,19 @@
+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-04 Antti Koivisto <[email protected]>
REGRESSION (r173468): Cannot step in WebInspector
Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176819 => 176820)
--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-04 22:56:01 UTC (rev 176819)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-04 22:57:53 UTC (rev 176820)
@@ -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
