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

Unified Diff: third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp

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
Index: third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp
diff --git a/third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp b/third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp
index b3465b5193601a67786fb03633da3a72be46d9c3..fd71e5780b4eb5088981ea67a18a172e7fb0e68b 100644
--- a/third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp
+++ b/third_party/WebKit/Source/modules/srcobject/HTMLMediaElementSrcObject.cpp
@@ -7,17 +7,14 @@
#include "core/html/HTMLMediaElement.h"
#include "modules/mediastream/MediaStream.h"
#include "platform/mediastream/MediaStreamDescriptor.h"
-#include "public/platform/WebMediaPlayerSource.h"
-#include "public/platform/WebMediaStream.h"
namespace blink {
// static
MediaStream* HTMLMediaElementSrcObject::srcObject(HTMLMediaElement& element)
{
- const WebMediaPlayerSource& source = element.getSrcObject();
- if (source.isMediaStream()) {
- MediaStreamDescriptor* descriptor = source.getAsMediaStream();
+ MediaStreamDescriptor* descriptor = element.getSrcObject();
+ if (descriptor) {
MediaStream* stream = toMediaStream(descriptor);
return stream;
}
@@ -29,12 +26,10 @@ MediaStream* HTMLMediaElementSrcObject::srcObject(HTMLMediaElement& element)
void HTMLMediaElementSrcObject::setSrcObject(HTMLMediaElement& element, MediaStream* mediaStream)
{
if (!mediaStream) {
- element.setSrcObject(WebMediaPlayerSource());
+ element.setSrcObject(nullptr);
return;
}
- WebMediaStream webStream = WebMediaStream(mediaStream->descriptor());
- WebMediaPlayerSource source(webStream);
- element.setSrcObject(source);
+ element.setSrcObject(mediaStream->descriptor());
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698