mac: Almost fix Lion accented character bubble input in web contents.

content/renderer/render_widget.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_widget.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1108 matching lines @@
     ui::Range range(ui::Range::InvalidRange());
     size_t location, length;
     if (webwidget_->caretOrSelectionRange(&location, &length)) {
       range.set_start(location);
       range.set_end(location + length);
     }
     Send(new ViewHostMsg_ImeCompositionRangeChanged(routing_id(), range));
   }
 }
 
-void RenderWidget::OnImeConfirmComposition(const string16& text) {
-  if (webwidget_)
+void RenderWidget::OnImeConfirmComposition(
+    const string16& text, const ui::Range& replacement_range) {
+  if (webwidget_) {
+    // TODO(thakis): Uncomment this once
+    // https://bugs.webkit.org/show_bug.cgi?id=69846 has landed.

[jamesr, 2011/10/12 00:34:51]

A better way to do this is to guard this code with something like

#if WEBWIDGET_HAS_SELECTION_RANGE_CHANGES

and then #define that in the WebWidget.h change.  The way it goes live as soon
as the WebKit change is rolled in and all you need to do is come back at some
point and remove the #ifs and #defines

although it looks like the change may actually be on WebFrame or some other
object instead.

+    // if (replacement_range.IsValid()) {
+    //   webwidget_->setSelectionOnFocusedFrame(replacement_range.start(),
+    //                                          replacement_range.end());
+    // }
     webwidget_->confirmComposition(text);
+  }
   // Send an updated IME range with just the caret range.
   ui::Range range(ui::Range::InvalidRange());
   size_t location, length;
   if (webwidget_->caretOrSelectionRange(&location, &length)) {
     range.set_start(location);
     range.set_end(location + length);
   }
   Send(new ViewHostMsg_ImeCompositionRangeChanged(routing_id(), range));
 }
 
@@ skipping 258 matching lines @@
   }
 }
 
 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
   return false;
 }
 
 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
   return false;
 }