Mac: Fix Korean input on OSX 10.11

handling_input_event_ needs to be set in RenderWidget::OnImeSetComposition,
otherwise RenderView::DidChangeSelection will skip sending the selection
change message the the browser, even though it was correctly set on the
renderer side.

Also fix incorrectly set selectedRange_ in -setMarkedText,
|newSelRange| is relative to the marked text while selectedRange_ is
relative to the entire text storage.

BUG=500376

Review URL: https://codereview.chromium.org/1240943002

Cr-Commit-Position: refs/heads/master@{#339754}

content/browser/renderer_host/render_widget_host_view_mac.h

@@ -120,6 +120,9 @@ class Layer;
   // Marked text which was generated by handling a key down event.
   base::string16 markedText_;
 
+  // Selected range of |markedText_|.
+  NSRange markedTextSelectedRange_;
+
   // Underline information of the |markedText_|.
   std::vector<blink::WebCompositionUnderline> underlines_;
 

content/browser/renderer_host/render_widget_host_view_mac.mm

@@ -2101,6 +2101,7 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
   // Clear them here so that we can know whether they have changed afterwards.
   textToBeInserted_.clear();
   markedText_.clear();
+  markedTextSelectedRange_ = NSMakeRange(NSNotFound, 0);
   underlines_.clear();
   unmarkTextCalled_ = NO;
   hasEditCommands_ = NO;
@@ -2184,11 +2185,11 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
   if (hasMarkedText_ && markedText_.length()) {
     // Sends the updated marked text to the renderer so it can update the
     // composition node in WebKit.
-    // When marked text is available, |selectedRange_| will be the range being
-    // selected inside the marked text.
+    // When marked text is available, |markedTextSelectedRange_| will be the
+    // range being selected inside the marked text.
     widgetHost->ImeSetComposition(markedText_, underlines_,
-                                  selectedRange_.location,
-                                  NSMaxRange(selectedRange_));
+                                  markedTextSelectedRange_.location,
+                                  NSMaxRange(markedTextSelectedRange_));
   } else if (oldHasMarkedText && !hasMarkedText_ && !textInserted) {
     if (unmarkTextCalled_) {
       widgetHost->ImeConfirmComposition(
@@ -2920,6 +2921,7 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
   // input method calls this method.
   hasMarkedText_ = NO;
   markedText_.clear();
+  markedTextSelectedRange_ = NSMakeRange(NSNotFound, 0);
   underlines_.clear();
 
   // If we are handling a key down event, then ConfirmComposition() will be
@@ -2944,7 +2946,7 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
   int length = [im_text length];
 
   // |markedRange_| will get set on a callback from ImeSetComposition().
-  selectedRange_ = newSelRange;
+  markedTextSelectedRange_ = newSelRange;
   markedText_ = base::SysNSStringToUTF16(im_text);
   hasMarkedText_ = (length > 0);
 

content/renderer/render_widget.cc

@@ -1685,6 +1685,8 @@ void RenderWidget::OnImeSetComposition(
   if (!ShouldHandleImeEvent())
     return;
   ImeEventGuard guard(this);
+  base::AutoReset<bool> handling_input_event_resetter(&handling_input_event_,
+                                                      true);
   if (!webwidget_->setComposition(
       text, WebVector<WebCompositionUnderline>(underlines),
       selection_start, selection_end)) {