Revert 273770 "Enable touch text selection tests on all Aura pla..."

trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc

 // Copyright (c) 2013 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/web_contents/touch_editable_impl_aura.h"
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
@@ skipping 237 matching lines @@
 }
 
 gfx::NativeView TouchEditableImplAura::GetNativeView() const {
   return rwhva_ ? rwhva_->GetNativeView()->GetToplevelWindow() : NULL;
 }
 
 void TouchEditableImplAura::ConvertPointToScreen(gfx::Point* point) {
   if (!rwhva_)
     return;
   aura::Window* window = rwhva_->GetNativeView();
-  aura::Window* root = window->GetRootWindow();
-
-  // First convert the point to root window coordinates, then if there is a
-  // screen position client, convert it to screen coordinates.
-  aura::Window::ConvertPointToTarget(window, root, point);
   aura::client::ScreenPositionClient* screen_position_client =
-      aura::client::GetScreenPositionClient(root);
+      aura::client::GetScreenPositionClient(window->GetRootWindow());
   if (screen_position_client)
-    screen_position_client->ConvertPointToScreen(root, point);
+    screen_position_client->ConvertPointToScreen(window, point);
 }
 
 void TouchEditableImplAura::ConvertPointFromScreen(gfx::Point* point) {
   if (!rwhva_)
     return;
   aura::Window* window = rwhva_->GetNativeView();
-  aura::Window* root = window->GetRootWindow();
-
-  // If there is a screen position client, convert the point from screen to root
-  // window and then to client coordinates. Otherwise, suppose the point is in
-  // root window coordinates and convert it to client coordinates.
   aura::client::ScreenPositionClient* screen_position_client =
-      aura::client::GetScreenPositionClient(root);
+      aura::client::GetScreenPositionClient(window->GetRootWindow());
   if (screen_position_client)
-    screen_position_client->ConvertPointFromScreen(root, point);
-  aura::Window::ConvertPointToTarget(root, window, point);
+    screen_position_client->ConvertPointFromScreen(window, point);
 }
 
 bool TouchEditableImplAura::DrawsHandles() {
   return false;
 }
 
 void TouchEditableImplAura::OpenContextMenu(const gfx::Point& anchor) {
   if (!rwhva_)
     return;
   gfx::Point point = anchor;
@@ skipping 93 matching lines @@
   }
   text_input_type_ = ui::TEXT_INPUT_TYPE_NONE;
   EndTouchEditing(true);
   selection_gesture_in_process_ = false;
   handles_hidden_due_to_scroll_ = false;
   scroll_in_progress_ = false;
   overscroll_in_progress_ = false;
 }
 
 }  // namespace content