Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(573)

Unified Diff: content/renderer/media/webmediaplayer_impl.h

Issue 222973003: Conversion of content_shell target to use WebLocalFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove some TODOs Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webmediaplayer_impl.h
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index 60d01387579bd297bd5c8cb0fdbc229074025f09..d59b7c2a390fe0a6d82ec322f3886447643abe0b 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -27,13 +27,14 @@
#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
#include "third_party/WebKit/public/platform/WebMediaPlayer.h"
#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
+// TODO(dcheng): Convert back to forward declare.
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "url/gurl.h"
class RenderAudioSourceProvider;
namespace blink {
class WebContentDecryptionModule;
-class WebFrame;
}
namespace base {
@@ -68,11 +69,10 @@ class WebMediaPlayerImpl
public:
// Constructs a WebMediaPlayer implementation using Chromium's media stack.
// |delegate| may be null.
- WebMediaPlayerImpl(
- blink::WebFrame* frame,
- blink::WebMediaPlayerClient* client,
- base::WeakPtr<WebMediaPlayerDelegate> delegate,
- const WebMediaPlayerParams& params);
+ WebMediaPlayerImpl(blink::WebLocalFrame* frame,
+ blink::WebMediaPlayerClient* client,
+ base::WeakPtr<WebMediaPlayerDelegate> delegate,
+ const WebMediaPlayerParams& params);
virtual ~WebMediaPlayerImpl();
virtual void load(LoadType load_type,
@@ -238,7 +238,7 @@ class WebMediaPlayerImpl
// NULL immediately and reset.
void SetDecryptorReadyCB(const media::DecryptorReadyCB& decryptor_ready_cb);
- blink::WebFrame* frame_;
+ blink::WebLocalFrame* frame_;
// TODO(hclam): get rid of these members and read from the pipeline directly.
blink::WebMediaPlayer::NetworkState network_state_;

Powered by Google App Engine
This is Rietveld 408576698