Changeset 236536 in webkit

Timestamp:

Sep 26, 2018 6:42:24 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Video track clone cannot preserve original property
​https://bugs.webkit.org/show_bug.cgi?id=189872
<rdar://problem/44706579>

Patch by YUHAN WU <​yuhan_wu@apple.com> on 2018-09-26
Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

• web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint-expected.txt:

Source/WebCore:

Fix the issue that the cloned track created by canvas.captureStream().getVideoTracks() cannot keep some attributes, such as enabled.
Updated a testcase expected result:
LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint.html

• Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp:

(WebCore::CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack):
(WebCore::CanvasCaptureMediaStreamTrack::create):
(WebCore::CanvasCaptureMediaStreamTrack::clone):

• Modules/mediastream/CanvasCaptureMediaStreamTrack.h:
• Modules/mediastream/MediaStreamTrack.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.h (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.h (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2018-09-26  YUHAN WU  <yuhan_wu@apple.com>
+
+        Video track clone cannot preserve original property
+        https://bugs.webkit.org/show_bug.cgi?id=189872
+        <rdar://problem/44706579>
+
+        Reviewed by Youenn Fablet.
+
+        * web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint-expected.txt:
+
 2018-09-26  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint-expected.txt

@@ -5 +5 @@
 PASS Accepts valid video contentHints 
 PASS Video tracks ignore invalid/audio contentHints 
-FAIL Cloned video tracks have separate contentHints assert_equals: expected "motion" but got ""
+PASS Cloned video tracks have separate contentHints 
 PASS Cloned audio tracks have separate contentHints 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-26  YUHAN WU  <yuhan_wu@apple.com>
+
+        Video track clone cannot preserve original property
+        https://bugs.webkit.org/show_bug.cgi?id=189872
+        <rdar://problem/44706579>
+
+        Reviewed by Youenn Fablet.
+
+        Fix the issue that the cloned track created by canvas.captureStream().getVideoTracks() cannot keep some attributes, such as enabled.
+        Updated a testcase expected result:
+        LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint.html
+
+        * Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp:
+        (WebCore::CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack):
+        (WebCore::CanvasCaptureMediaStreamTrack::create):
+        (WebCore::CanvasCaptureMediaStreamTrack::clone):
+        * Modules/mediastream/CanvasCaptureMediaStreamTrack.h:
+        * Modules/mediastream/MediaStreamTrack.h:
+
 2018-09-26  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.cpp

@@ -43 +43 @@
     : MediaStreamTrack(context, MediaStreamTrackPrivate::create(source.copyRef()))
     , m_canvas(WTFMove(canvas))
-    , m_source(WTFMove(source))
+{
+}
+
+CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(ScriptExecutionContext& context, Ref<HTMLCanvasElement>&& canvas, Ref<MediaStreamTrackPrivate>&& privateTrack)
+    : MediaStreamTrack(context, WTFMove(privateTrack))
+    , m_canvas(WTFMove(canvas))
 {
 }
@@ -175 +180 @@
     if (!scriptExecutionContext())
         return nullptr;
-
-    return CanvasCaptureMediaStreamTrack::create(*scriptExecutionContext(), m_canvas.copyRef(), m_source->frameRequestRate());
+    
+    return adoptRef(*new CanvasCaptureMediaStreamTrack(*scriptExecutionContext(), m_canvas.copyRef(), m_private->clone()));
 }
 

trunk/Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.h

@@ -43 +43 @@
 
     HTMLCanvasElement& canvas() { return m_canvas.get(); }
-    void requestFrame() { m_source->requestFrame(); }
+    void requestFrame() { static_cast<Source&>(source()).requestFrame(); }
 
     RefPtr<MediaStreamTrack> clone() final;
@@ -82 +82 @@
 
     CanvasCaptureMediaStreamTrack(ScriptExecutionContext&, Ref<HTMLCanvasElement>&&, Ref<Source>&&);
+    CanvasCaptureMediaStreamTrack(ScriptExecutionContext&, Ref<HTMLCanvasElement>&&, Ref<MediaStreamTrackPrivate>&&);
 
     bool isCanvas() const final { return true; }
 
     Ref<HTMLCanvasElement> m_canvas;
-    Ref<Source> m_source;
 };
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

@@ -150 +150 @@
 
     ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); }
-
+        
+    Ref<MediaStreamTrackPrivate> m_private;
+        
 private:
     explicit MediaStreamTrack(MediaStreamTrack&);
@@ -176 +178 @@
 
     Vector<Observer*> m_observers;
-    Ref<MediaStreamTrackPrivate> m_private;
+    
 
     MediaTrackConstraints m_constraints;