Title: [176367] branches/safari-600.3-branch/Source
- Revision
- 176367
- Author
- [email protected]
- Date
- 2014-11-19 16:34:35 -0800 (Wed, 19 Nov 2014)
Log Message
Merge r176356. rdar://problem/18996776
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (176366 => 176367)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-11-20 00:28:56 UTC (rev 176366)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-11-20 00:34:35 UTC (rev 176367)
@@ -1,5 +1,21 @@
2014-11-19 Dana Burkart <[email protected]>
+ Merge r176356. rdar://problem/18996776
+
+ 2014-11-19 Beth Dakin <[email protected]>
+
+ Invoking an action menu on a selection should result in the text menu
+ https://bugs.webkit.org/show_bug.cgi?id=138892
+ -and corresponding-
+ rdar://problem/18996776
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItems]):
+
+2014-11-19 Dana Burkart <[email protected]>
+
Merge r176351. rdar://problem/18971616
2014-11-19 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (176366 => 176367)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-20 00:28:56 UTC (rev 176366)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-11-20 00:34:35 UTC (rev 176367)
@@ -878,6 +878,13 @@
return [self _defaultMenuItemsForWhitespaceInEditableArea];
}
+ if (_hitTestResult.isSelected()) {
+ // A selection should present the read-only text menu. It might make more sense to present a new
+ // type of menu with just copy, but for the time being, we should stay consistent with text.
+ _type = WebActionMenuReadOnlyText;
+ return [self _defaultMenuItemsForText];
+ }
+
_type = WebActionMenuNone;
return @[ ];
}
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176366 => 176367)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-20 00:28:56 UTC (rev 176366)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-20 00:34:35 UTC (rev 176367)
@@ -1,5 +1,21 @@
2014-11-19 Dana Burkart <[email protected]>
+ Merge r176356. rdar://problem/18996776
+
+ 2014-11-19 Beth Dakin <[email protected]>
+
+ Invoking an action menu on a selection should result in the text menu
+ https://bugs.webkit.org/show_bug.cgi?id=138892
+ -and corresponding-
+ rdar://problem/18996776
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItems]):
+
+2014-11-19 Dana Burkart <[email protected]>
+
Merge r176351. rdar://problem/18971616
2014-11-19 Beth Dakin <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176366 => 176367)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-20 00:28:56 UTC (rev 176366)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-20 00:34:35 UTC (rev 176367)
@@ -950,6 +950,13 @@
return [self _defaultMenuItemsForWhitespaceInEditableArea];
}
+ if (hitTestResult->isSelected()) {
+ // A selection should present the read-only text menu. It might make more sense to present a new
+ // type of menu with just copy, but for the time being, we should stay consistent with text.
+ _type = kWKActionMenuReadOnlyText;
+ return [self _defaultMenuItemsForText];
+ }
+
_type = kWKActionMenuNone;
return _state != ActionMenuState::Ready ? @[ [NSMenuItem separatorItem] ] : @[ ];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
