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

Unified Diff: media/blink/webmediaplayer_impl.h

Issue 2640573002: Remove WebMediaPlayerDelegate null checks (Closed)
Patch Set: Fixed WMPMS and WMPA Created 3 years, 11 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: media/blink/webmediaplayer_impl.h
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index da1a062f3bb15e8347e889211251823b9140b874..5321b4aac886d16508824d9d9225caab0d6ee60a 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -90,12 +90,12 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
public base::SupportsWeakPtr<WebMediaPlayerImpl> {
public:
// Constructs a WebMediaPlayer implementation using Chromium's media stack.
- // |delegate| may be null. |renderer_factory| must not be null.
+ // |delegate| and |renderer_factory| must not be null.
WebMediaPlayerImpl(
blink::WebLocalFrame* frame,
blink::WebMediaPlayerClient* client,
blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
- base::WeakPtr<WebMediaPlayerDelegate> delegate,
+ WebMediaPlayerDelegate* delegate,
std::unique_ptr<RendererFactory> renderer_factory,
linked_ptr<UrlIndex> url_index,
const WebMediaPlayerParams& params);
@@ -506,7 +506,7 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
// |delegate_id_|; an id provided after registering with the delegate. The
// WebMediaPlayer may also receive directives (play, pause) from the delegate
// via the WebMediaPlayerDelegate::Observer interface after registration.
- base::WeakPtr<WebMediaPlayerDelegate> delegate_;
+ WebMediaPlayerDelegate* delegate_;
int delegate_id_;
WebMediaPlayerParams::DeferLoadCB defer_load_cb_;

Powered by Google App Engine
This is Rietveld 408576698