| Index: ui/views/cocoa/bridged_content_view.mm
|
| diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm
|
| index b5d67a19df856cc326768644356b961c201fc628..15ac3500bc7c36ed0e51d48931e75860ac9ef2ce 100644
|
| --- a/ui/views/cocoa/bridged_content_view.mm
|
| +++ b/ui/views/cocoa/bridged_content_view.mm
|
| @@ -1412,11 +1412,15 @@ ui::TextEditCommand GetTextEditCommandForMenuAction(SEL action) {
|
| composition.underlines.push_back(ui::CompositionUnderline(
|
| 0, [text length], SK_ColorBLACK, false, SK_ColorTRANSPARENT));
|
| textInputClient_->SetCompositionText(composition);
|
| + keyDownEvent_ = nil; // Handled.
|
| }
|
|
|
| - (void)unmarkText {
|
| - if (textInputClient_)
|
| - textInputClient_->ConfirmCompositionText();
|
| + if (!textInputClient_)
|
| + return;
|
| +
|
| + textInputClient_->ConfirmCompositionText();
|
| + keyDownEvent_ = nil; // Handled.
|
| }
|
|
|
| - (NSArray*)validAttributesForMarkedText {
|
|
|