Support IMM32 reconversion on Windows

chrome/browser/renderer_host/render_widget_host_view_views.cc

Index: chrome/browser/renderer_host/render_widget_host_view_views.cc
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index ffe15301410b319b29853b01b04a0006c07525c9..621171041bd08a273e0b0b4b8be9b0fd1e64cd52 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -166,11 +166,6 @@ void RenderWidgetHostViewViews::InitAsPopup(
   }
 }
 
-void RenderWidgetHostViewViews::InitAsFullscreen(

[Hironori Bono, 2011/10/26 02:39:37]

nit: I'm wondering why this change deletes this function. (I do not think this
function does not have connection with IMM32.)

[Peng, 2011/10/26 16:20:16]

Done.

-    RenderWidgetHostView* /*reference_host_view*/) {
-  NOTIMPLEMENTED();
-}
-
 RenderWidgetHost* RenderWidgetHostViewViews::GetRenderWidgetHost() const {
   return host_;
 }
@@ -384,10 +379,7 @@ void RenderWidgetHostViewViews::SetTooltipText(const string16& tip) {
 void RenderWidgetHostViewViews::SelectionChanged(const string16& text,
                                                  size_t offset,
                                                  const ui::Range& range) {
-  selection_text_ = text;
-  selection_text_offset_ = offset;
-  selection_range_ = range;
-
+  RenderWidgetHostView::SelectionChanged(text, offset, range);
   // TODO(anicolao): deal with the clipboard without GTK
   NOTIMPLEMENTED();
 }
@@ -752,9 +744,9 @@ bool RenderWidgetHostViewViews::HasCompositionText() {
 }
 
 bool RenderWidgetHostViewViews::GetTextRange(ui::Range* range) {
-  // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
-  NOTIMPLEMENTED();
-  return false;
+  *range = ui::Range(selection_text_offset_,
+                     selection_text_offset_ + selection_text_.length());
+  return true;
 }
 
 bool RenderWidgetHostViewViews::GetCompositionTextRange(ui::Range* range) {
@@ -764,9 +756,8 @@ bool RenderWidgetHostViewViews::GetCompositionTextRange(ui::Range* range) {
 }
 
 bool RenderWidgetHostViewViews::GetSelectionRange(ui::Range* range) {
-  // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
-  NOTIMPLEMENTED();
-  return false;
+  *range = selection_range_;
+  return true;
 }
 
 bool RenderWidgetHostViewViews::SetSelectionRange(const ui::Range& range) {
@@ -783,10 +774,22 @@ bool RenderWidgetHostViewViews::DeleteRange(const ui::Range& range) {
 
 bool RenderWidgetHostViewViews::GetTextFromRange(
     const ui::Range& range,
-    const base::Callback<void(const string16&)>& callback) {
-  // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
-  NOTIMPLEMENTED();
-  return false;
+    string16* text,
+    ui::Range* actual_range) {
+  ui::Range selection_text_range(
+      selection_text_offset_,
+      selection_text_offset_ + selection_text_.length());
+  *actual_range = selection_text_range.Intersect(range);
+
+  if (!actual_range->IsValid() || actual_range->is_empty()) {
+    text->clear();
+  } else {
+    *text = selection_text_.substr(
+        actual_range->GetMin() - selection_text_offset_,
+        actual_range->length());
+  }
+
+  return true;
 }
 
 void RenderWidgetHostViewViews::OnInputMethodChanged() {