BrowserPlugin: Remove BrowserPluginGuest::ToGuestRect

content/browser/frame_host/render_widget_host_view_guest.cc

 // Copyright 2014 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 "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
@@ skipping 110 matching lines @@
 #endif
 
 gfx::Rect RenderWidgetHostViewGuest::GetViewBounds() const {
   if (!guest_)
     return gfx::Rect();
 
   RenderWidgetHostViewBase* rwhv = GetGuestRenderWidgetHostView();
   gfx::Rect embedder_bounds;
   if (rwhv)
     embedder_bounds = rwhv->GetViewBounds();
-  gfx::Rect shifted_rect = guest_->ToGuestRect(embedder_bounds);
-  shifted_rect.set_width(size_.width());
-  shifted_rect.set_height(size_.height());
+  gfx::Rect shifted_rect;

[lazyboy, 2014/09/08 19:00:57]

Would be easier to read by constructing the Rect directly from origin and size.
return gfx::Rect(guest_->GetScreenCoordinates(..), size_);

You can do this in ImeCompositionRangeChanged() change as well.

[Fady Samuel, 2014/09/08 19:17:05]

Done.

+  shifted_rect.set_origin(
+      guest_->GetScreenCoordinates(embedder_bounds.origin()));
+  shifted_rect.set_size(size_);
   return shifted_rect;
 }
 
 void RenderWidgetHostViewGuest::RenderProcessGone(
     base::TerminationStatus status,
     int error_code) {
   platform_view_->RenderProcessGone(status, error_code);
   // Destroy the guest view instance only, so we don't end up calling
   // platform_view_->Destroy().
   DestroyGuestView();
@@ skipping 146 matching lines @@
     const gfx::Range& range,
     const std::vector<gfx::Rect>& character_bounds) {
   if (!guest_)
     return;
 
   RenderWidgetHostViewBase* rwhv = GetGuestRenderWidgetHostView();
   if (!rwhv)
     return;
   std::vector<gfx::Rect> guest_character_bounds;
   for (size_t i = 0; i < character_bounds.size(); ++i) {
-    gfx::Rect guest_rect = guest_->ToGuestRect(character_bounds[i]);
+    gfx::Rect guest_rect;
+    guest_rect.set_origin(guest_->GetScreenCoordinates(
+        character_bounds[i].origin()));
+    guest_rect.set_size(character_bounds[i].size());
     guest_character_bounds.push_back(guest_rect);
   }
   // Forward the information to embedding RWHV.
   rwhv->ImeCompositionRangeChanged(range, guest_character_bounds);
 }
 #endif
 
 void RenderWidgetHostViewGuest::SelectionChanged(const base::string16& text,
                                                  size_t offset,
                                                  const gfx::Range& range) {
   platform_view_->SelectionChanged(text, offset, range);
 }
 
 void RenderWidgetHostViewGuest::SelectionBoundsChanged(
     const ViewHostMsg_SelectionBounds_Params& params) {
   if (!guest_)
     return;
 
   RenderWidgetHostViewBase* rwhv = GetGuestRenderWidgetHostView();
   if (!rwhv)
     return;
   ViewHostMsg_SelectionBounds_Params guest_params(params);
-  guest_params.anchor_rect = guest_->ToGuestRect(params.anchor_rect);
-  guest_params.focus_rect = guest_->ToGuestRect(params.focus_rect);
+  guest_params.anchor_rect.set_origin(
+      guest_->GetScreenCoordinates(params.anchor_rect.origin()));
+  guest_params.focus_rect.set_origin(
+      guest_->GetScreenCoordinates(params.focus_rect.origin()));
   rwhv->SelectionBoundsChanged(guest_params);
 }
 
 void RenderWidgetHostViewGuest::CopyFromCompositingSurface(
     const gfx::Rect& src_subrect,
     const gfx::Size& dst_size,
     const base::Callback<void(bool, const SkBitmap&)>& callback,
     const SkColorType color_type) {
   CHECK(guest_);
   guest_->CopyFromCompositingSurface(src_subrect, dst_size, callback);
@@ skipping 188 matching lines @@
   return kN32_SkColorType;
 }
 
 RenderWidgetHostViewBase*
 RenderWidgetHostViewGuest::GetGuestRenderWidgetHostView() const {
   return static_cast<RenderWidgetHostViewBase*>(
       guest_->GetEmbedderRenderWidgetHostView());
 }
 
 }  // namespace content