Move Range code to gfx.

content/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2012 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/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <InputScope.h>
 #include <wtsapi32.h>
 #pragma comment(lib, "wtsapi32.lib")
 
@@ skipping 391 matching lines @@
       being_destroyed_(false),
       tooltip_hwnd_(NULL),
       tooltip_showing_(false),
       weak_factory_(this),
       is_loading_(false),
       text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       text_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT),
       can_compose_inline_(true),
       is_fullscreen_(false),
       ignore_mouse_movement_(true),
-      composition_range_(ui::Range::InvalidRange()),
+      composition_range_(gfx::Range::InvalidRange()),
       touch_state_(new WebTouchState(this)),
       pointer_down_context_(false),
       last_touch_location_(-1, -1),
       touch_events_enabled_(ui::AreTouchEventsEnabled()),
       gesture_recognizer_(ui::GestureRecognizer::Create(this)) {
   render_widget_host_->SetView(this);
   registrar_.Add(this,
                  NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllBrowserContextsAndSources());
 }
@@ skipping 296 matching lines @@
 }
 
 void RenderWidgetHostViewWin::ScrollOffsetChanged() {
 }
 
 void RenderWidgetHostViewWin::ImeCancelComposition() {
   imm32_manager_->CancelIME(m_hWnd);
 }
 
 void RenderWidgetHostViewWin::ImeCompositionRangeChanged(
-    const ui::Range& range,
+    const gfx::Range& range,
     const std::vector<gfx::Rect>& character_bounds) {
   composition_range_ = range;
   composition_character_bounds_ = character_bounds;
 }
 
 void RenderWidgetHostViewWin::Redraw() {
   RECT damage_bounds;
   GetUpdateRect(&damage_bounds, FALSE);
 
   base::win::ScopedGDIObject<HRGN> damage_region(CreateRectRgn(0, 0, 0, 0));
@@ skipping 274 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void RenderWidgetHostViewWin::InsertText(const string16& text) {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return;
   }
   if (render_widget_host_)
     render_widget_host_->ImeConfirmComposition(text,
-                                               ui::Range::InvalidRange(),
+                                               gfx::Range::InvalidRange(),
                                                false);
 }
 
 void RenderWidgetHostViewWin::InsertChar(char16 ch, int flags) {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return;
   }
   // TODO(nona): Implement this function.
   NOTIMPLEMENTED();
@@ skipping 57 matching lines @@
 bool RenderWidgetHostViewWin::HasCompositionText() {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return false;
   }
   // TODO(nona): Implement this function.
   NOTIMPLEMENTED();
   return false;
 }
 
-bool RenderWidgetHostViewWin::GetTextRange(ui::Range* range) {
+bool RenderWidgetHostViewWin::GetTextRange(gfx::Range* range) {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return false;
   }
   range->set_start(selection_text_offset_);
   range->set_end(selection_text_offset_ + selection_text_.length());
   return false;
 }
 
-bool RenderWidgetHostViewWin::GetCompositionTextRange(ui::Range* range) {
+bool RenderWidgetHostViewWin::GetCompositionTextRange(gfx::Range* range) {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return false;
   }
   // TODO(nona): Implement this function.
   NOTIMPLEMENTED();
   return false;
 }
 
-bool RenderWidgetHostViewWin::GetSelectionRange(ui::Range* range) {
+bool RenderWidgetHostViewWin::GetSelectionRange(gfx::Range* range) {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return false;
   }
   range->set_start(selection_range_.start());
   range->set_end(selection_range_.end());
   return false;
 }
 
-bool RenderWidgetHostViewWin::SetSelectionRange(const ui::Range& range) {
+bool RenderWidgetHostViewWin::SetSelectionRange(const gfx::Range& range) {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return false;
   }
   // TODO(nona): Implement this function.
   NOTIMPLEMENTED();
   return false;
 }
 
-bool RenderWidgetHostViewWin::DeleteRange(const ui::Range& range) {
+bool RenderWidgetHostViewWin::DeleteRange(const gfx::Range& range) {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return false;
   }
   // TODO(nona): Implement this function.
   NOTIMPLEMENTED();
   return false;
 }
 
-bool RenderWidgetHostViewWin::GetTextFromRange(const ui::Range& range,
+bool RenderWidgetHostViewWin::GetTextFromRange(const gfx::Range& range,
                                                string16* text) {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return false;
   }
-  ui::Range selection_text_range(selection_text_offset_,
+  gfx::Range selection_text_range(selection_text_offset_,
       selection_text_offset_ + selection_text_.length());
   if (!selection_text_range.Contains(range)) {
     text->clear();
     return false;
   }
   if (selection_text_range.EqualsIgnoringDirection(range)) {
     *text = selection_text_;
   } else {
     *text = selection_text_.substr(
         range.GetMin() - selection_text_offset_,
@@ skipping 494 matching lines @@
   // WebKit::WebCompositionUnderline, so that we can do reinterpret_cast safely.
   COMPILE_ASSERT(sizeof(ui::CompositionUnderline) ==
                  sizeof(WebKit::WebCompositionUnderline),
                  ui_CompositionUnderline__WebKit_WebCompositionUnderline_diff);
 
   // Retrieve the result string and its attributes of the ongoing composition
   // and send it to a renderer process.
   ui::CompositionText composition;
   if (imm32_manager_->GetResult(m_hWnd, lparam, &composition.text)) {
     render_widget_host_->ImeConfirmComposition(
-        composition.text, ui::Range::InvalidRange(), false);
+        composition.text, gfx::Range::InvalidRange(), false);
     imm32_manager_->ResetComposition(m_hWnd);
     // Fall though and try reading the composition string.
     // Japanese IMEs send a message containing both GCS_RESULTSTR and
     // GCS_COMPSTR, which means an ongoing composition has been finished
     // by the start of another composition.
   }
   // Retrieve the composition string and its attributes of the ongoing
   // composition and send it to a renderer process.
   if (imm32_manager_->GetComposition(m_hWnd, lparam, &composition)) {
     // TODO(suzhe): due to a bug of webkit, we can't use selection range with
     // composition string. See: https://bugs.webkit.org/show_bug.cgi?id=37788
-    composition.selection = ui::Range(composition.selection.end());
+    composition.selection = gfx::Range(composition.selection.end());
 
     // TODO(suzhe): convert both renderer_host and renderer to use
     // ui::CompositionText.
     const std::vector<WebKit::WebCompositionUnderline>& underlines =
         reinterpret_cast<const std::vector<WebKit::WebCompositionUnderline>&>(
             composition.underlines);
     render_widget_host_->ImeSetComposition(
         composition.text, underlines,
         composition.selection.start(), composition.selection.end());
   }
@@ skipping 1503 matching lines @@
   return new RenderWidgetHostViewWin(widget);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(
       WebKit::WebScreenInfo* results) {
   GetScreenInfoForWindow(0, results);
 }
 
 }  // namespace content