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

Unified Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.h

Issue 1886333002: Do not use a persistent reference to store srcObject in HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
index 3aa0db3b9a68f5973e176014c6d84e32fe5a9084..0bbb5fdba08cb0147b929a612d4afcfe52599a97 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
@@ -39,7 +39,6 @@
#include "platform/audio/AudioSourceProvider.h"
#include "public/platform/WebAudioSourceProviderClient.h"
#include "public/platform/WebMediaPlayerClient.h"
-#include "public/platform/WebMediaPlayerSource.h"
#include "public/platform/WebMimeRegistry.h"
namespace blink {
@@ -55,6 +54,7 @@ class HTMLTrackElement;
class KURL;
class MediaControls;
class MediaError;
+class MediaStreamDescriptor;
class HTMLMediaSource;
class ScriptState;
class TextTrackContainer;
@@ -111,8 +111,8 @@ public:
// network state
void setSrc(const AtomicString&);
const KURL& currentSrc() const { return m_currentSrc; }
- void setSrcObject(const WebMediaPlayerSource&);
- const WebMediaPlayerSource& getSrcObject() const { return m_srcObject; }
+ void setSrcObject(MediaStreamDescriptor*);
+ MediaStreamDescriptor* getSrcObject() const { return m_srcObject.get(); }
sof 2016/04/15 10:49:14 nit/fyi: get() is redundant (no need to address he
enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO_SOURCE };
NetworkState getNetworkState() const;
@@ -482,7 +482,7 @@ private:
ReadyState m_readyState;
ReadyState m_readyStateMaximum;
KURL m_currentSrc;
- WebMediaPlayerSource m_srcObject;
+ Member<MediaStreamDescriptor> m_srcObject;
Member<MediaError> m_error;
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698