Stretching NativeViewHost, and misc tab capture fixes.

content/browser/media/capture/cursor_renderer_aura.cc

 // Copyright (c) 2015 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/media/capture/cursor_renderer_aura.h"
 
 #include "base/memory/ptr_util.h"
+#include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
+#include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursors_aura.h"
 #include "ui/events/event_utils.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace content {
 
 // static
 std::unique_ptr<CursorRenderer> CursorRenderer::Create(
     gfx::NativeWindow window) {
@@ skipping 56 matching lines @@
   const gfx::Rect window_bounds = window_->GetBoundsInScreen();
   const gfx::Size view_size(window_bounds.width(), window_bounds.height());
   return view_size;
 }
 
 gfx::Point CursorRendererAura::GetCursorPositionInView() {
   if (!window_) {
     return gfx::Point();
   }
 
-  const gfx::Rect window_bounds = window_->GetBoundsInScreen();
+  // Convert from screen coordinates to view coordinates.
+  aura::Window* const root_window = window_->GetRootWindow();
+  if (!root_window)
+    return gfx::Point();
+  aura::client::ScreenPositionClient* const client =
+      aura::client::GetScreenPositionClient(root_window);
+  if (!client)
+    return gfx::Point();
   gfx::Point cursor_position = aura::Env::GetInstance()->last_mouse_location();
-  cursor_position.Offset(-window_bounds.x(), -window_bounds.y());
+  client->ConvertPointFromScreen(window_, &cursor_position);
   return cursor_position;
 }
 
 gfx::NativeCursor CursorRendererAura::GetLastKnownCursor() {
   if (!window_) {
     return gfx::NativeCursor();
   }
 
   return window_->GetHost()->last_cursor();
 }
@@ skipping 26 matching lines @@
 }
 
 void CursorRendererAura::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(window_, window);
   window_->RemovePreTargetHandler(this);
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace content