Changeset 246001 in webkit

Timestamp:

May 31, 2019, 4:49:14 PM (7 years ago)

Author:

Alan Coon

Message:

Apply patch. rdar://problem/50871594

Location:

branches/safari-607-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStreamTrack.cpp (modified) (1 diff)
• html/HTMLMediaElement.h (modified) (2 diffs)

branches/safari-607-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-31  Alan Coon  <alancoon@apple.com>
+
+        Apply patch. rdar://problem/50871594
+
+    2019-05-31  youenn fablet  <youennf@gmail.com>
+
+            REGRESSION(245357): Netflix, Hulu, Amazon, YouTube Rental video playback crash at com.apple.WebCore: WebCore::WebKitMediaKeys::setMediaElement
+            rdar://problem/50871594
+
+            Do not cast WeakPtr<MediaProducer> into WeakPtr<HTMLMediaElement>.
+            Instead, make HTMLMediaElement again a CanMakeWeakPtr<HTMLMediaElement>
+            and directly create WeakPtr<HTMLMediaElement>.
+
+            For MediaStreamTrack, rely on weakThis to know whether 'this' is still alive and use 'this' directly.
+
+            Manually tested.
+
+            * Modules/mediastream/MediaStreamTrack.cpp:
+            (WebCore::MediaStreamTrack::applyConstraints):
+            * html/HTMLMediaElement.h:
+
 2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

@@ -332 +332 @@
 
     auto weakThis = makeWeakPtr(*this);
-    auto failureHandler = [weakThis, this] (const String& failedConstraint, const String& message) {
-        if (!weakThis || !m_promise)
+    auto failureHandler = [weakThis] (const String& failedConstraint, const String& message) {
+        if (!weakThis || !weakThis->m_promise)
             return;
-        m_promise->rejectType<IDLInterface<OverconstrainedError>>(OverconstrainedError::create(failedConstraint, message).get());
+        weakThis->m_promise->rejectType<IDLInterface<OverconstrainedError>>(OverconstrainedError::create(failedConstraint, message).get());
     };
-    auto successHandler = [weakThis, this, constraints] () {
-        if (!weakThis || !m_promise)
+    auto successHandler = [weakThis, constraints] () {
+        if (!weakThis || !weakThis->m_promise)
             return;
-        m_promise->resolve();
-        m_constraints = constraints.valueOr(MediaTrackConstraints { });
+        weakThis->m_promise->resolve();
+        weakThis->m_constraints = constraints.valueOr(MediaTrackConstraints { });
     };
     m_private->applyConstraints(createMediaConstraints(constraints), WTFMove(successHandler), WTFMove(failureHandler));

branches/safari-607-branch/Source/WebCore/html/HTMLMediaElement.h

@@ -127 +127 @@
     , public ActiveDOMObject
     , public MediaControllerInterface
-    , public CanMakeWeakPtr<HTMLMediaElement>
     , public PlatformMediaSessionClient
     , private MediaCanStartListener
     , private MediaPlayerClient
-    , private MediaProducer
+    , public MediaProducer
     , private VisibilityChangeClient
     , private ApplicationStateChangeListener
@@ -188 +187 @@
     MediaPlayerEnums::VideoGravity videoFullscreenGravity() const { return m_videoFullscreenGravity; }
 #endif
-
-    using CanMakeWeakPtr<HTMLMediaElement>::weakPtrFactory;
 
     void scheduleCheckPlaybackTargetCompatability();