Revert of Use Window coordinates for IME composition bounds, auto resize

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 1ba1326fdfba5681f6f41def0836c881b286108c..d74f07734f11a3e95acb4a60de587b738e536716 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2659,15 +2659,8 @@
   DCHECK(disable_scrollbars_size_limit_.IsEmpty());
   if (!webview())
     return;
-
   auto_resize_mode_ = true;
-  if (IsUseZoomForDSFEnabled()) {
-    webview()->enableAutoResizeMode(
-        gfx::ScaleToCeiledSize(min_size, device_scale_factor_),
-        gfx::ScaleToCeiledSize(max_size, device_scale_factor_));
-  } else {
-    webview()->enableAutoResizeMode(min_size, max_size);
-  }
+  webview()->enableAutoResizeMode(min_size, max_size);
 }
 
 void RenderViewImpl::OnDisableAutoResize(const gfx::Size& new_size) {
@@ -3252,8 +3245,7 @@
     // Current Pepper IME API does not handle selection bounds. So we simply
     // use the caret position as an empty range for now. It will be updated
     // after Pepper API equips features related to surrounding text retrieval.
-    blink::WebRect caret(focused_pepper_plugin_->GetCaretBounds());
-    convertViewportToWindow(&caret);
+    gfx::Rect caret = focused_pepper_plugin_->GetCaretBounds();
     *start = caret;
     *end = caret;
     return;
@@ -3268,9 +3260,9 @@
 }
 
 void RenderViewImpl::GetCompositionCharacterBounds(
-    std::vector<gfx::Rect>* bounds_in_window) {
-  DCHECK(bounds_in_window);
-  bounds_in_window->clear();
+    std::vector<gfx::Rect>* bounds) {
+  DCHECK(bounds);
+  bounds->clear();
 
 #if defined(ENABLE_PLUGINS)
   if (focused_pepper_plugin_) {
@@ -3291,16 +3283,15 @@
   if (!frame)
     return;
 
-  bounds_in_window->reserve(character_count);
+  bounds->reserve(character_count);
   blink::WebRect webrect;
   for (size_t i = 0; i < character_count; ++i) {
     if (!frame->firstRectForCharacterRange(start_offset + i, 1, webrect)) {
       DLOG(ERROR) << "Could not retrieve character rectangle at " << i;
-      bounds_in_window->clear();
+      bounds->clear();
       return;
     }
-    convertViewportToWindow(&webrect);
-    bounds_in_window->push_back(webrect);
+    bounds->push_back(webrect);
   }
 }