Support IMM32 reconversion on Windows

chrome/browser/renderer_host/render_widget_host_view_views.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 "chrome/browser/renderer_host/render_widget_host_view_views.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 148 matching lines @@
                pos.y() - parent_host_view->GetViewBounds().y());
   views::View::SetBounds(p.x(), p.y(), pos.width(), pos.height());
   Show();
 
   if (NeedsInputGrab()) {
     set_focusable(true);
     RequestFocus();
   }
 }
 
-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_;
 }
 
 void RenderWidgetHostViewViews::DidBecomeSelected() {
   if (!is_hidden_)
     return;
 
   if (tab_switch_paint_time_.is_null())
     tab_switch_paint_time_ = base::TimeTicks::Now();
@@ skipping 193 matching lines @@
   // Clamp the tooltip length to kMaxTooltipLength so that we don't
   // accidentally DOS the user with a mega tooltip.
   tooltip_text_ = ui::TruncateString(tip, kMaxTooltipLength);
   if (GetWidget())
     GetWidget()->TooltipTextChanged(this);
 }
 
 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();
 }
 
 void RenderWidgetHostViewViews::SelectionBoundsChanged(
     const gfx::Rect& start_rect,
     const gfx::Rect& end_rect) {
   views::InputMethod* input_method = GetInputMethod();
 
   if (selection_start_rect_ == start_rect && selection_end_rect_ == end_rect)
@@ skipping 344 matching lines @@
 
 gfx::Rect RenderWidgetHostViewViews::GetCaretBounds() {
   return selection_start_rect_.Union(selection_end_rect_);
 }
 
 bool RenderWidgetHostViewViews::HasCompositionText() {
   return has_composition_text_;
 }
 
 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) {
   // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
   NOTIMPLEMENTED();
   return false;
 }
 
 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) {
   // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
   NOTIMPLEMENTED();
   return false;
 }
 
 bool RenderWidgetHostViewViews::DeleteRange(const ui::Range& range) {
   // TODO(suzhe): implement this method when fixing http://crbug.com/55130.
   NOTIMPLEMENTED();
   return false;
 }
 
 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() {
   if (!host_)
     return;
 
   DCHECK(GetInputMethod());
   host_->SetInputMethodActive(GetInputMethod()->IsActive());
 
   // TODO(suzhe): implement the newly added “locale” property of HTML DOM
@@ skipping 359 matching lines @@
   for (std::vector< base::Callback<void(void)> >::const_iterator
       it = on_compositing_ended_callbacks_.begin();
       it != on_compositing_ended_callbacks_.end(); ++it) {
     it->Run();
   }
   on_compositing_ended_callbacks_.clear();
   compositor->RemoveObserver(this);
 }
 
 #endif