| Index: ui/views/controls/native/native_view_host_aura.h
|
| diff --git a/ui/views/controls/native/native_view_host_aura.h b/ui/views/controls/native/native_view_host_aura.h
|
| index 45e859082eb7ddd2b551d384c254d48e6087df35..8dc2bbab8aeea3897fbafd3ea603c6a87f843575 100644
|
| --- a/ui/views/controls/native/native_view_host_aura.h
|
| +++ b/ui/views/controls/native/native_view_host_aura.h
|
| @@ -9,6 +9,7 @@
|
| #include "base/macros.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_observer.h"
|
| +#include "ui/gfx/transform.h"
|
| #include "ui/views/controls/native/native_view_host_wrapper.h"
|
| #include "ui/views/views_export.h"
|
|
|
| @@ -31,7 +32,8 @@ class VIEWS_EXPORT NativeViewHostAura : public NativeViewHostWrapper,
|
| void InstallClip(int x, int y, int w, int h) override;
|
| bool HasInstalledClip() override;
|
| void UninstallClip() override;
|
| - void ShowWidget(int x, int y, int w, int h) override;
|
| + void ShowWidget(int x, int y, int w, int h, int render_w, int render_h)
|
| + override;
|
| void HideWidget() override;
|
| void SetFocus() override;
|
| gfx::NativeViewAccessible GetNativeViewAccessible() override;
|
| @@ -65,6 +67,13 @@ class VIEWS_EXPORT NativeViewHostAura : public NativeViewHostWrapper,
|
| aura::Window clipping_window_;
|
| std::unique_ptr<gfx::Rect> clip_rect_;
|
|
|
| + // Set when AttachNativeView() is called. This is the original transform of
|
| + // the NativeView's layer. The NativeView's layer may be modified to scale
|
| + // when ShowWidget() is called with a rendering size not equal to the region's
|
| + // size. When NativeViewDetaching() is called, the NativeView's
|
| + // transform is restored to this.
|
| + gfx::Transform original_transform_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(NativeViewHostAura);
|
| };
|
|
|
|
|