Stretching NativeViewHost, and misc tab capture fixes.

ui/views/controls/native/native_view_host_aura.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 "ui/views/controls/native/native_view_host_aura.h"
 
 #include "base/logging.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
@@ skipping 76 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostAura, NativeViewHostWrapper implementation:
 void NativeViewHostAura::AttachNativeView() {
   clipping_window_delegate_->set_native_view(host_->native_view());
   host_->native_view()->AddObserver(this);
   host_->native_view()->SetProperty(views::kHostViewKey,
       static_cast<View*>(host_));
+  original_transform_ = host_->native_view()->transform();
   AddClippingWindow();
 }
 
 void NativeViewHostAura::NativeViewDetaching(bool destroyed) {
   clipping_window_delegate_->set_native_view(NULL);
   RemoveClippingWindow();
   if (!destroyed) {
     host_->native_view()->RemoveObserver(this);
     host_->native_view()->ClearProperty(views::kHostViewKey);
     host_->native_view()->ClearProperty(aura::client::kHostWindowKey);
+    host_->native_view()->SetTransform(original_transform_);
     host_->native_view()->Hide();
     if (host_->native_view()->parent())
       Widget::ReparentNativeView(host_->native_view(), NULL);
   }
 }
 
 void NativeViewHostAura::AddedToWidget() {
   if (!host_->native_view())
     return;
 
@@ skipping 21 matching lines @@
 }
 
 bool NativeViewHostAura::HasInstalledClip() {
   return !!clip_rect_;
 }
 
 void NativeViewHostAura::UninstallClip() {
   clip_rect_.reset();
 }
 
-void NativeViewHostAura::ShowWidget(int x, int y, int w, int h) {
-  int width = w;
-  int height = h;
+void NativeViewHostAura::ShowWidget(int x,
+                                    int y,
+                                    int w,
+                                    int h,
+                                    int render_w,
+                                    int render_h) {
   if (host_->fast_resize()) {
     gfx::Point origin(x, y);
     views::View::ConvertPointFromWidget(host_, &origin);
     InstallClip(origin.x(), origin.y(), w, h);
-    width = host_->native_view()->bounds().width();
-    height = host_->native_view()->bounds().height();
+    render_w = host_->native_view()->bounds().width();
+    render_h = host_->native_view()->bounds().height();
+  } else {
+    gfx::Transform transform = original_transform_;
+    if (w > 0 && h > 0 && render_w > 0 && render_h > 0) {
+      transform.Scale(static_cast<SkMScalar>(w) / render_w,
+                      static_cast<SkMScalar>(h) / render_h);
+    }
+    host_->native_view()->SetTransform(transform);
   }
+
   clipping_window_.SetBounds(clip_rect_ ? *clip_rect_
                                         : gfx::Rect(x, y, w, h));
-
   gfx::Point clip_offset = clipping_window_.bounds().origin();
   host_->native_view()->SetBounds(
-      gfx::Rect(x - clip_offset.x(), y - clip_offset.y(), width, height));
+      gfx::Rect(x - clip_offset.x(), y - clip_offset.y(), render_w, render_h));
   host_->native_view()->Show();
   clipping_window_.Show();
 }
 
 void NativeViewHostAura::HideWidget() {
   host_->native_view()->Hide();
   clipping_window_.Hide();
 }
 
 void NativeViewHostAura::SetFocus() {
@@ skipping 54 matching lines @@
     } else {
       clipping_window_.RemoveChild(host_->native_view());
     }
     host_->native_view()->SetBounds(clipping_window_.bounds());
   }
   if (clipping_window_.parent())
     clipping_window_.parent()->RemoveChild(&clipping_window_);
 }
 
 }  // namespace views