Index: remoting/client/frame_consumer_proxy.h |
diff --git a/remoting/client/frame_consumer_proxy.h b/remoting/client/frame_consumer_proxy.h |
index 21e8fe488c45e9e9d958caa2719daa855cdb6c97..f32a31313828f6902a241229b6392e7df2790a7d 100644 |
--- a/remoting/client/frame_consumer_proxy.h |
+++ b/remoting/client/frame_consumer_proxy.h |
@@ -26,7 +26,8 @@ class FrameConsumerProxy |
public: |
// Constructs a proxy for |frame_consumer| which will trampoline invocations |
// to |frame_consumer_message_loop|. |
- FrameConsumerProxy(scoped_refptr<base::SingleThreadTaskRunner> task_runner); |
+ FrameConsumerProxy(scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
+ const base::WeakPtr<FrameConsumer>& frame_consumer); |
// FrameConsumer implementation. |
virtual void ApplyBuffer(const webrtc::DesktopSize& view_size, |
@@ -36,10 +37,7 @@ class FrameConsumerProxy |
virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) OVERRIDE; |
virtual void SetSourceSize(const webrtc::DesktopSize& source_size, |
const webrtc::DesktopVector& dpi) OVERRIDE; |
- |
- // Attaches to |frame_consumer_|. |
- // This must only be called from |frame_consumer_message_loop_|. |
- void Attach(const base::WeakPtr<FrameConsumer>& frame_consumer); |
+ virtual PixelFormat GetPixelFormat() OVERRIDE; |
private: |
friend class base::RefCountedThreadSafe<FrameConsumerProxy>; |
@@ -48,6 +46,8 @@ class FrameConsumerProxy |
base::WeakPtr<FrameConsumer> frame_consumer_; |
scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
+ PixelFormat pixel_format_; |
+ |
DISALLOW_COPY_AND_ASSIGN(FrameConsumerProxy); |
}; |