| Index: content/browser/renderer_host/render_widget_host_view_aura.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| index fcfd3dd0d5f36d590993a1278b939c2e9ae4e98a..a6d45c78e4ff9c15ef09752b113ef4d9cc80aa56 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -40,6 +40,7 @@ class WindowTracker;
|
| }
|
|
|
| namespace cc {
|
| +class CopyOutputResult;
|
| class DelegatedFrameData;
|
| }
|
|
|
| @@ -433,12 +434,20 @@ class RenderWidgetHostViewAura
|
| // after it was released as the frontbuffer.
|
| void SetSurfaceNotInUseByCompositor(scoped_refptr<ui::Texture>);
|
|
|
| - // Called after async thumbnailer task completes. Used to call
|
| - // AdjustSurfaceProtection.
|
| - static void CopyFromCompositingSurfaceFinished(
|
| - const SkBitmap& bitmap,
|
| + // Called after async thumbnailer task completes. Scales and crops the result
|
| + // of the copy.
|
| + static void CopyFromCompositingSurfaceHasResult(
|
| + const gfx::Size& dst_size_in_pixel,
|
| const base::Callback<void(bool, const SkBitmap&)>& callback,
|
| - bool result);
|
| + scoped_ptr<cc::CopyOutputResult> result);
|
| + static void PrepareTextureCopyOutputResult(
|
| + const gfx::Size& dst_size_in_pixel,
|
| + const base::Callback<void(bool, const SkBitmap&)>& callback,
|
| + scoped_ptr<cc::CopyOutputResult> result);
|
| + static void PrepareBitmapCopyOutputResult(
|
| + const gfx::Size& dst_size_in_pixel,
|
| + const base::Callback<void(bool, const SkBitmap&)>& callback,
|
| + scoped_ptr<cc::CopyOutputResult> result);
|
|
|
| ui::Compositor* GetCompositor();
|
|
|
|
|