Split WebMediaPlayerImpl::Proxy into its own class.

webkit/glue/webmediaplayer_proxy.h

Index: webkit/glue/webmediaplayer_proxy.h
diff --git a/webkit/glue/webmediaplayer_proxy.h b/webkit/glue/webmediaplayer_proxy.h
new file mode 100644
index 0000000000000000000000000000000000000000..c9b4bab8160aae56502eaed1f32bdd8438d96515
--- /dev/null
+++ b/webkit/glue/webmediaplayer_proxy.h
@@ -0,0 +1,120 @@
+// Copyright (c) 2011 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.
+
+#ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_PROXY_H_
+#define WEBKIT_GLUE_WEBMEDIAPLAYER_PROXY_H_
+
+#include <list>
+
+#include "base/memory/ref_counted.h"
+#include "base/synchronization/lock.h"
+#include "media/filters/chunk_demuxer_client.h"
+#include "webkit/glue/media/web_data_source.h"
+
+class MessageLoop;
+class SkCanvas;
+
+namespace gfx {
+class Rect;
+}
+
+namespace webkit_glue {
+
+class WebMediaPlayerImpl;
+class WebVideoRenderer;
+
+// Acts a thread proxy between the various threads used for multimedia and the

[acolwell GONE FROM CHROMIUM, 2011/07/27 16:03:03]

s/Acts a/Acts as a/

[scherkus (not reviewing), 2011/07/27 17:48:19]

Done.

+// render thread that WebMediaPlayerImpl is running on.
+class WebMediaPlayerProxy
+    : public base::RefCountedThreadSafe<WebMediaPlayerProxy>,
+      public media::ChunkDemuxerClient {
+ public:
+  WebMediaPlayerProxy(MessageLoop* render_loop,
+                      WebMediaPlayerImpl* webmediaplayer);
+
+  // Methods for Filter -> WebMediaPlayerImpl communication.
+  void Repaint();
+  void SetVideoRenderer(scoped_refptr<WebVideoRenderer> video_renderer);
+  WebDataSourceBuildObserverHack* GetBuildObserver();
+
+  // Methods for WebMediaPlayerImpl -> Filter communication.
+  void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect);
+  void SetSize(const gfx::Rect& rect);
+  void Detach();
+  void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out);
+  void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame);
+  bool HasSingleOrigin();
+  void AbortDataSources();
+
+  // Methods for PipelineImpl -> WebMediaPlayerImpl communication.
+  void PipelineInitializationCallback(media::PipelineStatus status);
+  void PipelineSeekCallback(media::PipelineStatus status);
+  void PipelineEndedCallback(media::PipelineStatus status);
+  void PipelineErrorCallback(media::PipelineStatus error);
+  void NetworkEventCallback(media::PipelineStatus status);
+
+  // ChunkDemuxerClient implementation.
+  virtual void DemuxerOpened(media::ChunkDemuxer* demuxer) OVERRIDE;
+  virtual void DemuxerClosed() OVERRIDE;
+
+  // Methods for Demuxer communication.
+  void DemuxerFlush();
+  bool DemuxerAppend(const uint8* data, size_t length);
+  void DemuxerEndOfStream(media::PipelineStatus status);
+  void DemuxerShutdown();
+
+  void DemuxerOpenedTask(const scoped_refptr<media::ChunkDemuxer>& demuxer);
+  void DemuxerClosedTask();
+
+  // Returns the message loop used by the proxy.
+  MessageLoop* message_loop() { return render_loop_; }
+
+ private:
+  friend class base::RefCountedThreadSafe<WebMediaPlayerProxy>;
+  virtual ~WebMediaPlayerProxy();
+
+  // Adds a data source to data_sources_.
+  void AddDataSource(WebDataSource* data_source);
+
+  // Invoke |webmediaplayer_| to perform a repaint.
+  void RepaintTask();
+
+  // Notify |webmediaplayer_| that initialization has finished.
+  void PipelineInitializationTask(media::PipelineStatus status);
+
+  // Notify |webmediaplayer_| that a seek has finished.
+  void PipelineSeekTask(media::PipelineStatus status);
+
+  // Notify |webmediaplayer_| that the media has ended.
+  void PipelineEndedTask(media::PipelineStatus status);
+
+  // Notify |webmediaplayer_| that a pipeline error has occurred during
+  // playback.
+  void PipelineErrorTask(media::PipelineStatus error);
+
+  // Notify |webmediaplayer_| that there's a network event.
+  void NetworkEventTask(media::PipelineStatus status);
+
+  // The render message loop where WebKit lives.
+  MessageLoop* render_loop_;
+  WebMediaPlayerImpl* webmediaplayer_;
+
+  base::Lock data_sources_lock_;
+  typedef std::list<scoped_refptr<WebDataSource> > DataSourceList;
+  DataSourceList data_sources_;
+  scoped_ptr<WebDataSourceBuildObserverHack> build_observer_;
+
+  scoped_refptr<WebVideoRenderer> video_renderer_;
+
+  base::Lock lock_;
+  int outstanding_repaints_;
+
+  scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
+};
+
+}  // namespace webkit_glue
+
+#endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_PROXY_H_