Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp

Issue 2883383003: Make EnabledInRichlyEditableText return false for user-triggered command and unfocused selection (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/editing/style/apply_style_with_unfocused_selection.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp b/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp
index 03a3aa44e59366023459af77a6d31442871996b8..1ec42115f6a1781897453833b75dbf94ff6628fb 100644
--- a/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/EditorCommand.cpp
@@ -2051,7 +2051,7 @@ static bool EnabledCut(LocalFrame& frame, Event*, EditorCommandSource source) {
static bool EnabledInEditableText(LocalFrame& frame,
Event* event,
- EditorCommandSource) {
+ EditorCommandSource source) {
frame.GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
return frame.GetEditor().SelectionForCommand(event).RootEditableElement();
}
@@ -2073,8 +2073,11 @@ static bool EnabledDelete(LocalFrame& frame,
static bool EnabledInRichlyEditableText(LocalFrame& frame,
Event*,
- EditorCommandSource) {
+ EditorCommandSource source) {
frame.GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
+ if (source == kCommandFromMenuOrKeyBinding &&
+ !frame.Selection().SelectionHasFocus())
+ return false;
return !frame.Selection()
.ComputeVisibleSelectionInDOMTreeDeprecated()
.IsNone() &&
« no previous file with comments | « third_party/WebKit/LayoutTests/editing/style/apply_style_with_unfocused_selection.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698