Refactoring code to use factories to create DataSource objects.

BUG=72485
TEST=None for now. Existing unit tests cover this code.

Review URL: http://codereview.chromium.org/6480050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78033 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 3 deletions

diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index cadf4d7..e7acf27 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -67,6 +67,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
+#include "webkit/glue/media/web_data_source.h"
 
 class GURL;
 
@@ -77,7 +78,6 @@ class WebFrame;
 namespace webkit_glue {
 
 class MediaResourceLoaderBridgeFactory;
-class WebDataSource;
 class WebVideoRenderer;
 
 class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
@@ -99,7 +99,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
     // Methods for Filter -> WebMediaPlayerImpl communication.
     void Repaint();
     void SetVideoRenderer(scoped_refptr<WebVideoRenderer> video_renderer);
-    void AddDataSource(scoped_refptr<WebDataSource> data_source);
+    WebDataSourceBuildObserverHack* GetBuildObserver();
 
     // Methods for WebMediaPlayerImpl -> Filter communication.
     void Paint(skia::PlatformCanvas* canvas, const gfx::Rect& dest_rect);
@@ -125,6 +125,9 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
 
     virtual ~Proxy();
 
+    // Adds a data source to data_sources_.
+    void AddDataSource(WebDataSource* data_source);
+
     // Invoke |webmediaplayer_| to perform a repaint.
     void RepaintTask();
 
@@ -150,6 +153,7 @@ class WebMediaPlayerImpl : public WebKit::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_;