Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Unified Diff: trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc

Issue 304253007: Revert 273770 "Enable touch text selection tests on all Aura pla..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc
===================================================================
--- trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc (revision 273804)
+++ trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc (working copy)
@@ -255,31 +255,20 @@
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() {
« no previous file with comments | « no previous file | trunk/src/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698