Move content offset to ViewAndroid

content/browser/renderer_host/render_widget_host_impl.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_impl.h"
 
 #include <math.h>
 
 #include <set>
 #include <tuple>
@@ skipping 2327 matching lines @@
                                   is_running_navigation_hint_task);
 }
 
 void RenderWidgetHostImpl::DidReceiveRendererFrame() {
   view_->DidReceiveRendererFrame();
 }
 
 void RenderWidgetHostImpl::WindowSnapshotReachedScreen(int snapshot_id) {
   DCHECK(base::MessageLoopForUI::IsCurrent());
 
-  gfx::Rect view_bounds = GetView()->GetViewBounds();
-  gfx::Rect snapshot_bounds(view_bounds.size());
+#if defined(ANDROID)
+  // On Android, call sites should pass in the bounds with correct offset
+  // to capture the intended content area.
+  gfx::Rect snapshot_bounds(GetView()->GetViewBounds());

[boliu, 2016/12/22 21:14:59]

Feels like GrabViewSnapshotAsync should grab the offset directly from
ViewAndroid, then this code doesn't need to be specialized. Also
RWHVA::GetViewBounds don't need to change either I think?

[boliu, 2016/12/22 21:28:54]

Oh, I see sievers complained about the translation in
https://codereview.chromium.org/2219823002/diff/1/ui/snapshot/snapshot_androi...

So maybe not do what I said above..

Documentation for GrabViewSnapshotAsync says source_rect is in *layer* space.
This means that right now RWHVA::GetViewBounds is wrong. The translation should
be moved out of GetViewBounds to here, because we don't want to read the entire
layer. Sucks to have platform-specific code here, but I guess that makes sense
because only android has top controls.

Also did you test all the cases that he mentioned in that comment, and
everything still works as expected after this CL?

[Jinsuk Kim, 2017/01/03 07:07:48]

I take it that you want the change in RWVHA::GetViewBounds() reverted?
Yes, quoting my own comment in case you might have missed it:

+#else
+  gfx::Rect snapshot_bounds(GetView()->GetViewBounds().size());
+#endif
 
   std::vector<unsigned char> png;
   if (ui::GrabViewSnapshot(
       GetView()->GetNativeView(), &png, snapshot_bounds)) {
     OnSnapshotDataReceived(snapshot_id, &png.front(), png.size());
     return;
   }
 
   ui::GrabViewSnapshotAsync(
       GetView()->GetNativeView(),
@@ skipping 146 matching lines @@
     // different from the receiver's.
     file_system_file.url =
         GURL(storage::GetIsolatedFileSystemRootURIString(
                  file_system_url.origin(), filesystem_id, std::string())
                  .append(register_name));
     file_system_file.filesystem_id = filesystem_id;
   }
 }
 
 }  // namespace content