| Index: content/browser/compositor/delegated_frame_host.h
|
| diff --git a/content/browser/compositor/delegated_frame_host.h b/content/browser/compositor/delegated_frame_host.h
|
| index 0f2b28c3df38e07b50b0ea2d16466040205e7263..99c431a96765b1557a49a6904bbe482da5522b0b 100644
|
| --- a/content/browser/compositor/delegated_frame_host.h
|
| +++ b/content/browser/compositor/delegated_frame_host.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_
|
| #define CONTENT_BROWSER_COMPOSITOR_DELEGATED_FRAME_HOST_H_
|
|
|
| +#include <vector>
|
| +
|
| #include "base/gtest_prod_util.h"
|
| #include "cc/layers/delegated_frame_provider.h"
|
| #include "cc/layers/delegated_frame_resource_collection.h"
|
| @@ -22,6 +24,7 @@
|
| #include "ui/compositor/compositor_vsync_manager.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/compositor/layer_owner_delegate.h"
|
| +#include "ui/events/event.h"
|
| #include "ui/gfx/geometry/rect_conversions.h"
|
|
|
| namespace base {
|
| @@ -149,7 +152,7 @@ class CONTENT_EXPORT DelegatedFrameHost
|
| void CopyFromCompositingSurfaceToVideoFrame(
|
| const gfx::Rect& src_subrect,
|
| const scoped_refptr<media::VideoFrame>& target,
|
| - const base::Callback<void(bool)>& callback);
|
| + const base::Callback<void(const gfx::Rect&, bool)>& callback);
|
| bool CanCopyToVideoFrame() const;
|
| void BeginFrameSubscription(
|
| scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber);
|
| @@ -229,7 +232,7 @@ class CONTENT_EXPORT DelegatedFrameHost
|
| base::WeakPtr<DelegatedFrameHost> rwhva,
|
| scoped_refptr<OwnedMailbox> subscriber_texture,
|
| scoped_refptr<media::VideoFrame> video_frame,
|
| - const base::Callback<void(bool)>& callback,
|
| + const base::Callback<void(const gfx::Rect&, bool)>& callback,
|
| scoped_ptr<cc::CopyOutputResult> result);
|
| static void CopyFromCompositingSurfaceFinishedForVideo(
|
| base::WeakPtr<DelegatedFrameHost> rwhva,
|
|
|